Support GL_OES_EGL_image_external

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2011 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 499 matching lines @@
 
     // The last target that was bound to this texture unit.
     GLenum bind_target;
 
     // texture currently bound to this unit's GL_TEXTURE_2D with glBindTexture
     TextureManager::TextureInfo::Ref bound_texture_2d;
 
     // texture currently bound to this unit's GL_TEXTURE_CUBE_MAP with
     // glBindTexture
     TextureManager::TextureInfo::Ref bound_texture_cube_map;
+
+    // texture currently bound to this unit's GL_TEXTURE_EXTERNAL_OES with
+    // glBindTexture
+    TextureManager::TextureInfo::Ref bound_texture_external_oes;
   };
 
   // Initialize or re-initialize the shader translator.
   bool InitializeShaderTranslator();
 
   void UpdateCapabilities();
 
   // Helpers for the glGen and glDelete functions.
   bool GenTexturesHelper(GLsizei n, const GLuint* client_ids);
   void DeleteTexturesHelper(GLsizei n, const GLuint* client_ids);
@@ skipping 557 matching lines @@
         break;
       case GL_TEXTURE_CUBE_MAP:
       case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
       case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
       case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
         info = unit.bound_texture_cube_map;
         break;
+      case GL_TEXTURE_EXTERNAL_OES:
+        info = unit.bound_texture_external_oes;
+        break;
       // Note: If we ever support TEXTURE_RECTANGLE as a target, be sure to
       // track |texture_| with the currently bound TEXTURE_RECTANGLE texture,
       // because |texture_| is used by the FBO rendering mechanism for readback
       // to the bits that get sent to the browser.
       default:
         NOTREACHED();
         return NULL;
     }
     return (info && !info->IsDeleted()) ? info : NULL;
   }
@@ skipping 613 matching lines @@
   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);
   glGenBuffersARB(1, &fixed_attrib_buffer_id_);
 
   texture_units_.reset(
       new TextureUnit[group_->max_texture_units()]);
   for (uint32 tt = 0; tt < group_->max_texture_units(); ++tt) {
     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);
+    // We want the last bind to be 2D.
+    TextureManager::TextureInfo* info;
+    if (feature_info_->feature_flags().oes_egl_image_external) {
+      info = texture_manager()->GetDefaultTextureInfo(GL_TEXTURE_EXTERNAL_OES);
+      texture_units_[tt].bound_texture_external_oes = info;
+      glBindTexture(GL_TEXTURE_EXTERNAL_OES, info->service_id());
+    }
+    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());
   }
   glActiveTexture(GL_TEXTURE0);
   CHECK_GL_ERROR();
 
   ContextCreationAttribParser attrib_parser;
@@ skipping 1069 matching lines @@
   glBindTexture(target, info->service_id());
   TextureUnit& unit = texture_units_[active_texture_unit_];
   unit.bind_target = target;
   switch (target) {
     case GL_TEXTURE_2D:
       unit.bound_texture_2d = info;
       break;
     case GL_TEXTURE_CUBE_MAP:
       unit.bound_texture_cube_map = info;
       break;
+    case GL_TEXTURE_EXTERNAL_OES:
+      if (feature_info_->feature_flags().oes_egl_image_external)

[greggman, 2011/07/20 01:41:18]

I don't think you need to check here. If the feature is not enabled validation
will prevent this getting called with GL_TEXTURE_EXTERNAL_OES

+        unit.bound_texture_external_oes = info;
+      else
+        NOTREACHED(); // Validation should prevent us getting here.
+      break;
     default:
       NOTREACHED();  // Validation should prevent us getting here.
       break;
   }
 }
 
 void GLES2DecoderImpl::DoDisableVertexAttribArray(GLuint index) {
   if (vertex_attrib_manager_.Enable(index, false)) {
     if (index != 0 ||
         gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) {
@@ skipping 274 matching lines @@
         if (unit.bound_texture_cube_map) {
           GLuint client_id = 0;
           texture_manager()->GetClientId(
               unit.bound_texture_cube_map->service_id(), &client_id);
           *params = client_id;
         } else {
           *params = 0;
         }
       }
       return true;
+    case GL_TEXTURE_BINDING_EXTERNAL_OES:
+      *num_written = 1;
+      if (params) {
+        TextureUnit& unit = texture_units_[active_texture_unit_];
+        if (unit.bound_texture_external_oes) {
+          GLuint client_id = 0;
+          texture_manager()->GetClientId(
+              unit.bound_texture_external_oes->service_id(), &client_id);
+          *params = client_id;
+        } else {
+          *params = 0;
+        }
+      }
+      return true;
     default:
       *num_written = util_.GLGetNumValuesReturned(pname);
       return false;
   }
 }
 
 bool GLES2DecoderImpl::GetNumValuesReturnedForGLGet(
     GLenum pname, GLsizei* num_values) {
   return GetHelper(pname, NULL, num_values);
 }
@@ skipping 749 matching lines @@
 
 void GLES2DecoderImpl::DoUniform1iv(
     GLint location, GLsizei count, const GLint *value) {
   if (!CheckCurrentProgramForUniform(location, "glUniform1iv")) {
     return;
   }
   GLenum type = 0;
   if (!PrepForSetUniformByLocation(location, "glUniform1iv", &type, &count)) {
     return;
   }
-  if (type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE) {
+  if (type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE ||
+      type == GL_SAMPLER_EXTERNAL_OES) {
     current_program_->SetSamplers(location, count, value);
   }
   glUniform1iv(location, count, value);
 }
 
 void GLES2DecoderImpl::DoUniform1fv(
     GLint location, GLsizei count, const GLfloat* value) {
   GLenum type = 0;
   if (!PrepForSetUniformByLocation(location, "glUniform1fv", &type, &count)) {
     return;
@@ skipping 204 matching lines @@
   const ProgramManager::ProgramInfo::SamplerIndices& sampler_indices =
      current_program_->sampler_indices();
   for (size_t ii = 0; ii < sampler_indices.size(); ++ii) {
     const ProgramManager::ProgramInfo::UniformInfo* uniform_info =
         current_program_->GetUniformInfo(sampler_indices[ii]);
     DCHECK(uniform_info);
     for (size_t jj = 0; jj < uniform_info->texture_units.size(); ++jj) {
       GLuint texture_unit_index = uniform_info->texture_units[jj];
       if (texture_unit_index < group_->max_texture_units()) {
         TextureUnit& texture_unit = texture_units_[texture_unit_index];
         TextureManager::TextureInfo* texture_info =

[greggman, 2011/07/20 01:41:18]

This seems like it should be a function now that it's complicated? Like
TextureUnit::GetInfoForTarget(GLenum target) ?

             uniform_info->type == GL_SAMPLER_2D ?
                 texture_unit.bound_texture_2d :
-                texture_unit.bound_texture_cube_map;
+                (uniform_info->type == GL_SAMPLER_EXTERNAL_OES ?
+                    texture_unit.bound_texture_external_oes :
+                    texture_unit.bound_texture_cube_map);
         if (!texture_info || !texture_info->CanRender(feature_info_)) {
           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_EXTERNAL_OES ?

[greggman, 2011/07/20 01:41:18]

This also seems like it might be better as a function.

GetBindTargetForSampleType

or something?

+                      GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_CUBE_MAP),
               texture_manager()->black_texture_id(uniform_info->type));
         }
       }
       // else: should this be an error?
     }
   }
   return textures_set;
 }
 
 void GLES2DecoderImpl::RestoreStateForNonRenderableTextures() {
@@ skipping 2668 matching lines @@
   return false;
 }
 
 // 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