Add check on Cube Completeness for Cube textures and improve the efficiency of checks associated wi…

Source/core/html/canvas/WebGLTexture.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 26 matching lines @@
 }
 
 WebGLTexture::WebGLTexture(WebGLRenderingContext* ctx)
     : WebGLSharedObject(ctx)
     , m_target(0)
     , m_minFilter(GraphicsContext3D::NEAREST_MIPMAP_LINEAR)
     , m_magFilter(GraphicsContext3D::LINEAR)
     , m_wrapS(GraphicsContext3D::REPEAT)
     , m_wrapT(GraphicsContext3D::REPEAT)
     , m_isNPOT(false)
+    , m_isCubeComplete(false)
     , m_isComplete(false)
     , m_needToUseBlackTexture(false)
     , m_isFloatType(false)
     , m_isHalfFloatType(false)
 {
     ScriptWrappable::init(this);
     setObject(ctx->graphicsContext3D()->createTexture());
 }
 
 WebGLTexture::~WebGLTexture()
@@ skipping 218 matching lines @@
 
 bool WebGLTexture::canGenerateMipmaps()
 {
     if (isNPOT())
         return false;
     const LevelInfo& first = m_info[0][0];
     for (size_t ii = 0; ii < m_info.size(); ++ii) {
         const LevelInfo& info = m_info[ii][0];
         if (!info.valid
             || info.width != first.width || info.height != first.height
-            || info.internalFormat != first.internalFormat || info.type != first.type)
+            || info.internalFormat != first.internalFormat || info.type != first.type
+            || (m_info.size() > 1 && !m_isCubeComplete))
             return false;
     }
     return true;
 }
 
 GC3Dint WebGLTexture::computeLevelCount(GC3Dsizei width, GC3Dsizei height)
 {
     // return 1 + log2Floor(std::max(width, height));
     GC3Dsizei n = std::max(width, height);
     if (n <= 0)
@@ skipping 15 matching lines @@
 void WebGLTexture::update()
 {
     m_isNPOT = false;
     for (size_t ii = 0; ii < m_info.size(); ++ii) {
         if (isNPOT(m_info[ii][0].width, m_info[ii][0].height)) {
             m_isNPOT = true;
             break;
         }
     }
     m_isComplete = true;
+    m_isCubeComplete = true;
     const LevelInfo& first = m_info[0][0];
     GC3Dint levelCount = computeLevelCount(first.width, first.height);
     if (levelCount < 1)
         m_isComplete = false;
     else {
         for (size_t ii = 0; ii < m_info.size() && m_isComplete; ++ii) {
             const LevelInfo& info0 = m_info[ii][0];
             if (!info0.valid
                 || info0.width != first.width || info0.height != first.height
-                || info0.internalFormat != first.internalFormat || info0.type != first.type) {
+                || info0.internalFormat != first.internalFormat || info0.type != first.type
+                || (m_info.size() > 1 && info0.width != info0.height)) {
+                if (m_info.size() > 1)
+                    m_isCubeComplete = false;
                 m_isComplete = false;
                 break;
             }
             GC3Dsizei width = info0.width;
             GC3Dsizei height = info0.height;
             for (GC3Dint level = 1; level < levelCount; ++level) {
                 width = std::max(1, width >> 1);
                 height = std::max(1, height >> 1);
                 const LevelInfo& info = m_info[ii][level];
                 if (!info.valid
                     || info.width != width || info.height != height
                     || info.internalFormat != info0.internalFormat || info.type != info0.type) {
                     m_isComplete = false;
                     break;
                 }
 
             }
         }
     }
-    m_isFloatType = false;
-    if (m_isComplete)
-        m_isFloatType = m_info[0][0].type == GraphicsContext3D::FLOAT;
-    else {
-        for (size_t ii = 0; ii < m_info.size(); ++ii) {
-            if (m_info[ii][0].type == GraphicsContext3D::FLOAT) {
-                m_isFloatType = true;
-                break;
-            }
-        }
-    }
-    m_isHalfFloatType = false;
-    if (m_isComplete)
-        m_isHalfFloatType = m_info[0][0].type == GraphicsContext3D::HALF_FLOAT_OES;
-    else {
-        for (size_t ii = 0; ii < m_info.size(); ++ii) {
-            if (m_info[ii][0].type == GraphicsContext3D::HALF_FLOAT_OES) {
-                m_isHalfFloatType = true;
-                break;
-            }
-        }
-    }
+    m_isFloatType = m_info[0][0].type == GraphicsContext3D::FLOAT;
+    m_isHalfFloatType = m_info[0][0].type == GraphicsContext3D::HALF_FLOAT_OES;
 
     m_needToUseBlackTexture = false;
     // NPOT
     if (m_isNPOT && ((m_minFilter != GraphicsContext3D::NEAREST && m_minFilter != GraphicsContext3D::LINEAR)
                      || m_wrapS != GraphicsContext3D::CLAMP_TO_EDGE || m_wrapT != GraphicsContext3D::CLAMP_TO_EDGE))
         m_needToUseBlackTexture = true;
+    // If it is a Cube texture, check Cube Completeness first
+    if (m_info.size() > 1 && !m_isCubeComplete)
+        m_needToUseBlackTexture = true;
     // Completeness
     if (!m_isComplete && m_minFilter != GraphicsContext3D::NEAREST && m_minFilter != GraphicsContext3D::LINEAR)
         m_needToUseBlackTexture = true;
 }
 
 const WebGLTexture::LevelInfo* WebGLTexture::getLevelInfo(GC3Denum target, GC3Dint level) const
 {
     if (!object() || !m_target)
         return 0;
     int targetIndex = mapTargetToIndex(target);
     if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size()))
         return 0;
     if (level < 0 || level >= static_cast<GC3Dint>(m_info[targetIndex].size()))
         return 0;
     return &(m_info[targetIndex][level]);
 }
 
 }