Fixes for the default texture....

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 255 matching lines @@
     return id_;
   }
 
  private:
   GLES2DecoderImpl* decoder_;
   GLuint id_;
   DISALLOW_COPY_AND_ASSIGN(FrameBuffer);
 };
 
 #if defined(GLES2_GPU_SERVICE_TRANSLATE_SHADER)
-void FinalizeShaderTranslator(void*) {
+void FinalizeShaderTranslator(void* /* dummy */) {
   ShFinalize();
 }
 
 bool InitializeShaderTranslator() {
   static bool initialized = false;
   if (!initialized && ShInitialize()) {
     base::AtExitManager::RegisterCallback(&FinalizeShaderTranslator, NULL);
     initialized = true;
   }
   return initialized;
@@ skipping 932 matching lines @@
   GLsizei attrib_0_size_;
 
   // Current active texture by 0 - n index.
   // In other words, if we call glActiveTexture(GL_TEXTURE2) this value would
   // be 2.
   GLuint active_texture_unit_;
 
   // Which textures are bound to texture units through glActiveTexture.
   scoped_array<TextureUnit> texture_units_;
 
-  // Black (0,0,0,1) textures for when non-renderable textures are used.
-  // NOTE: There is no corresponding TextureInfo for these textures.
-  // TextureInfos are only for textures the client side can access.
-  GLuint black_2d_texture_id_;
-  GLuint black_cube_texture_id_;
-
   // state saved for clearing so we can clear render buffers and then
   // restore to these values.
   GLclampf clear_red_;
   GLclampf clear_green_;
   GLclampf clear_blue_;
   GLclampf clear_alpha_;
   GLboolean mask_red_;
   GLboolean mask_green_;
   GLboolean mask_blue_;
   GLboolean mask_alpha_;
@@ skipping 273 matching lines @@
 
 GLES2DecoderImpl::GLES2DecoderImpl(ContextGroup* group)
     : GLES2Decoder(group),
       error_bits_(0),
       util_(0),  // TODO(gman): Set to actual num compress texture formats.
       pack_alignment_(4),
       unpack_alignment_(4),
       attrib_0_buffer_id_(0),
       attrib_0_size_(0),
       active_texture_unit_(0),
-      black_2d_texture_id_(0),
-      black_cube_texture_id_(0),
       clear_red_(0),
       clear_green_(0),
       clear_blue_(0),
       clear_alpha_(0),
       mask_red_(true),
       mask_green_(true),
       mask_blue_(true),
       mask_alpha_(true),
       clear_stencil_(0),
       mask_stencil_front_(-1),
@@ skipping 69 matching lines @@
   // OpenGL ES 2.0 does not have this issue.
   glEnableVertexAttribArray(0);
   glGenBuffersARB(1, &attrib_0_buffer_id_);
   glBindBuffer(GL_ARRAY_BUFFER, attrib_0_buffer_id_);
   glVertexAttribPointer(0, 1, GL_FLOAT, GL_FALSE, 0, NULL);
   glBindBuffer(GL_ARRAY_BUFFER, 0);
 
   texture_units_.reset(
       new TextureUnit[group_->max_texture_units()]);
   for (uint32 tt = 0; tt < group_->max_texture_units(); ++tt) {
-    texture_units_[tt].bound_texture_2d =
-        texture_manager()->GetDefaultTextureInfo(GL_TEXTURE_2D);
-    texture_units_[tt].bound_texture_cube_map =
+    glActiveTexture(GL_TEXTURE0 + tt);
+    // Do cube map first because we want the last bind to be 2D.
+    TextureManager::TextureInfo* info =
         texture_manager()->GetDefaultTextureInfo(GL_TEXTURE_CUBE_MAP);
+    texture_units_[tt].bound_texture_cube_map = info;
+    glBindTexture(GL_TEXTURE_CUBE_MAP, info->service_id());
+    info = texture_manager()->GetDefaultTextureInfo(GL_TEXTURE_2D);
+    texture_units_[tt].bound_texture_2d = info;
+    glBindTexture(GL_TEXTURE_2D, info->service_id());
   }
-
-  GLuint ids[2];
-  glGenTextures(2, ids);
-  // Make black textures for replacing non-renderable textures.
-  black_2d_texture_id_ = ids[0];
-  black_cube_texture_id_ = ids[1];
-  static uint8 black[] = {0, 0, 0, 255};
-  glBindTexture(GL_TEXTURE_2D, black_2d_texture_id_);
-  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA,
-               GL_UNSIGNED_BYTE, black);
-  glBindTexture(GL_TEXTURE_2D, 0);
-  glBindTexture(GL_TEXTURE_CUBE_MAP, black_cube_texture_id_);
-  for (int ii = 0; ii < GLES2Util::kNumFaces; ++ii) {
-    glTexImage2D(GLES2Util::IndexToGLFaceTarget(ii), 0, GL_RGBA, 1, 1, 0,
-                 GL_RGBA, GL_UNSIGNED_BYTE, black);
-  }
-  glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
+  glActiveTexture(GL_TEXTURE0);
   CHECK_GL_ERROR();
 
   if (context_->IsOffscreen()) {
     // Create the target frame buffer. This is the one that the client renders
     // directly to.
     offscreen_target_frame_buffer_.reset(new FrameBuffer(this));
     offscreen_target_frame_buffer_->Create();
     offscreen_target_color_texture_.reset(new Texture(this));
     offscreen_target_color_texture_->Create();
     offscreen_target_depth_render_buffer_.reset(
@@ skipping 457 matching lines @@
   }
   if (fragment_compiler_ != NULL) {
     ShDestruct(fragment_compiler_);
     fragment_compiler_ = NULL;
   }
 #endif  // GLES2_GPU_SERVICE_TRANSLATE_SHADER)
 
   if (context_.get()) {
     MakeCurrent();
 
-    if (black_2d_texture_id_) {
-      glDeleteTextures(1, &black_2d_texture_id_);
-    }
-    if (black_cube_texture_id_) {
-      glDeleteTextures(1, &black_cube_texture_id_);
-    }
     if (attrib_0_buffer_id_) {
       glDeleteBuffersARB(1, &attrib_0_buffer_id_);
     }
 
     // Remove the saved frame buffer mapping from the parent decoder. The
     // parent pointer is a weak pointer so it will be null if the parent has
     // already been destroyed.
     if (parent_) {
       // First check the texture has been mapped into the parent. This might not
       // be the case if initialization failed midway through.
@@ skipping 1323 matching lines @@
         TextureManager::TextureInfo* texture_info =
             uniform_info->type == GL_SAMPLER_2D ?
                 texture_unit.bound_texture_2d :
                 texture_unit.bound_texture_cube_map;
         if (!texture_info || !texture_info->CanRender(texture_manager())) {
           textures_set = true;
           glActiveTexture(GL_TEXTURE0 + texture_unit_index);
           glBindTexture(
               uniform_info->type == GL_SAMPLER_2D ? GL_TEXTURE_2D :
                                                     GL_TEXTURE_CUBE_MAP,
-              uniform_info->type == GL_SAMPLER_2D ? black_2d_texture_id_ :
-                                                    black_cube_texture_id_);
+              texture_manager()->black_texture_id(uniform_info->type));
         }
       }
       // else: should this be an error?
     }
   }
   return textures_set;
 }
 
 void GLES2DecoderImpl::RestoreStateForNonRenderableTextures() {
   DCHECK(current_program_);
@@ skipping 1882 matching lines @@
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu