Remove blink side NPOT/incomplete texture handling.

third_party/WebKit/Source/modules/webgl/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 22 matching lines @@
 {
     return new WebGLTexture(ctx);
 }
 
 WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx)
     : WebGLSharedPlatform3DObject(ctx)
     , m_target(0)
     , m_isNPOT(false)
     , m_isCubeComplete(false)
     , m_isComplete(false)
-    , m_needToUseBlackTexture(false)
     , m_isFloatType(false)
     , m_isHalfFloatType(false)
     , m_isWebGL2OrHigher(ctx->isWebGL2OrHigher())
     , m_immutable(false)
     , m_baseLevel(0)
     , m_maxLevel(1000)
 {
     setObject(ctx->webContext()->createTexture());
 }
 
@@ skipping 167 matching lines @@
             for (size_t level = m_baseLevel + 1; level <= maxLevel; ++level) {
                 width = std::max(1, width >> 1);
                 height = std::max(1, height >> 1);
                 depth = std::max(1, depth >> 1);
                 LevelInfo& info = m_info[ii][level];
                 info.setInfo(info0.internalFormat, width, height, depth, info0.type);
             }
         }
         m_isComplete = true;
     }
-    m_needToUseBlackTexture = false;
 }
 
 GLenum WebGLTexture::getInternalFormat(GLenum target, GLint level) const
 {
     const LevelInfo* info = getLevelInfo(target, level);
     if (!info)
         return 0;
     return info->internalFormat;
 }
 
@@ skipping 52 matching lines @@
     if (!object())
         return false;
     return m_isNPOT;
 }
 
 bool WebGLTexture::needToUseBlackTexture(TextureExtensionFlag flag, const WebGLSamplerState* samplerState) const
 {
     ASSERT(samplerState);
     if (!object())
         return false;
-    if (m_needToUseBlackTexture)
-        return true;
     if ((m_isFloatType && !(flag & TextureFloatLinearExtensionEnabled)) || (m_isHalfFloatType && !(flag && TextureHalfFloatLinearExtensionEnabled))) {
         if (samplerState->magFilter != GL_NEAREST || (samplerState->minFilter != GL_NEAREST && samplerState->minFilter != GL_NEAREST_MIPMAP_NEAREST))
             return true;
     }
     return false;
 }
 
 void WebGLTexture::deleteObjectImpl(WebGraphicsContext3D* context3d)
 {
     context3d->deleteTexture(m_object);
@@ skipping 114 matching lines @@
                     || info.internalFormat != info0.internalFormat || info.type != info0.type) {
                     m_isComplete = false;
                     break;
                 }
 
             }
         }
     }
     m_isFloatType = m_info[0][0].type == GL_FLOAT;
     m_isHalfFloatType = m_info[0][0].type == GL_HALF_FLOAT_OES;
-
-    m_needToUseBlackTexture = false;
-    // If it is a Cube texture, check Cube Completeness first
-    if (m_info.size() > 1 && !m_isCubeComplete)
-        m_needToUseBlackTexture = true;
-    if (!m_isWebGL2OrHigher) {
-        // We can do these checks up front in WebGL 1 because there's no separate samplers.
-        // NPOT
-        if (m_isNPOT && ((m_samplerState.minFilter != GL_NEAREST && m_samplerState.minFilter != GL_LINEAR)
-            || m_samplerState.wrapS != GL_CLAMP_TO_EDGE || m_samplerState.wrapT != GL_CLAMP_TO_EDGE))
-            m_needToUseBlackTexture = true;
-        // Completeness
-        if (!m_isComplete && m_samplerState.minFilter != GL_NEAREST && m_samplerState.minFilter != GL_LINEAR)
-            m_needToUseBlackTexture = true;
-    }
 }
 
 const WebGLTexture::LevelInfo* WebGLTexture::getLevelInfo(GLenum target, GLint level) const
 {
     if (!object() || !m_target)
         return nullptr;
     int targetIndex = mapTargetToIndex(target);
     if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size()))
         return nullptr;
     if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size()))
@@ skipping 126 matching lines @@
     case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
     case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
     case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
         return GL_UNSIGNED_BYTE;
     default:
         return GL_NONE;
     }
 }
 
 } // namespace blink