Reland of "gpu: workaround force_cube_map_positive_x_allocation fixes Android crash."

gpu/command_buffer/service/texture_manager.cc

 // Copyright (c) 2012 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/texture_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 1922 matching lines @@
     DecoderTextureState* texture_state,
     ContextState* state,
     DecoderFramebufferState* framebuffer_state,
     const char* function_name,
     const DoTexImageArguments& args) {
   TextureRef* texture_ref;
   if (!ValidateTexImage(state, function_name, args, &texture_ref)) {
     return;
   }
 
+  // ValidateTexImage is passed already.
+  Texture* texture = texture_ref->texture();
+  if (texture->target() == GL_TEXTURE_CUBE_MAP) {

[no sievers, 2015/08/21 19:30:30]

This breaks all cubemap uploads that don't go through one of the workarounds,
right?
Because of the return in line 1984. We should also avoid the alloc (for |zero|)
below when not needed.

[dshwang, 2015/08/27 06:09:53]

yes, I made a mistake. Fixed.

+    std::vector<GLenum> undefined_faces;
+    if (texture_state->force_cube_complete) {
+      int width = 0;
+      int height = 0;
+      for (unsigned i = 0; i < 6; i++) {
+        if (!texture->GetLevelSize(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i,

[no sievers, 2015/08/21 19:30:30]

Can't GetLevelSize() return true even though width and height are zero?

[dshwang, 2015/08/27 06:09:53]

this routine check if the face is defined, not size. |width| and |height| are
output, not input.

+                                   args.level, &width, &height, nullptr))
+          undefined_faces.push_back(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i);
+      }
+    } else if (texture_state->force_cube_map_positive_x_allocation &&
+               args.target != GL_TEXTURE_CUBE_MAP_POSITIVE_X) {
+      int width = 0;
+      int height = 0;
+      if (!texture->GetLevelSize(GL_TEXTURE_CUBE_MAP_POSITIVE_X, args.level,
+                                 &width, &height, nullptr))
+        undefined_faces.push_back(GL_TEXTURE_CUBE_MAP_POSITIVE_X);
+      undefined_faces.push_back(args.target);
+    }
+
+    if (!memory_tracker_managed_->EnsureGPUMemoryAvailable(
+            undefined_faces.size() * args.pixels_size)) {
+      ERRORSTATE_SET_GL_ERROR(state->GetErrorState(), GL_OUT_OF_MEMORY,
+                              function_name, "out of memory");
+      return;
+    }
+    DoTexImageArguments new_args = args;
+    scoped_ptr<char[]> zero(new char[args.pixels_size]);
+    memset(zero.get(), 0, args.pixels_size);
+    for (GLenum face : undefined_faces) {
+      new_args.target = face;
+      if (face == args.target) {
+        new_args.pixels = args.pixels;
+      } else {
+        new_args.pixels = zero.get();
+      }
+      DoTexImage(texture_state, state->GetErrorState(), framebuffer_state,
+                 function_name, texture_ref, new_args);
+    }
+    return;
+  }
+
   DoTexImage(texture_state, state->GetErrorState(), framebuffer_state,
              function_name, texture_ref, args);
 }
 
 GLenum TextureManager::AdjustTexFormat(GLenum format) const {
   // TODO(bajones): GLES 3 allows for internal format and format to differ.
   // This logic may need to change as a result.
   if (gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL) {
     if (format == GL_SRGB_EXT)
       return GL_RGB;
@@ skipping 147 matching lines @@
   // The link to the memory tracking |client_id| is given a higher importance
   // than other refs.
   if (ref == ref->texture()->memory_tracking_ref_)
     importance = 2;
 
   pmd->AddOwnershipEdge(client_guid, service_guid, importance);
 }
 
 }  // namespace gles2
 }  // namespace gpu