Adds support for the GL_ANGLE_texture_usage and GL_EXT_texture_storage

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 733 matching lines @@
     const void * data);
 
   // Wrapper for TexImageIOSurface2DCHROMIUM.
   void DoTexImageIOSurface2DCHROMIUM(
     GLenum target,
     GLsizei width,
     GLsizei height,
     GLuint io_surface_id,
     GLuint plane);
 
+  // Wrapper for TexStorage2DEXT.
+  error::Error DoTexStorage2DEXT(
+    GLenum target,
+    GLint levels,
+    GLenum internal_format,
+    GLsizei width,
+    GLsizei height);
+
   // Creates a ProgramInfo for the given program.
   ProgramManager::ProgramInfo* CreateProgramInfo(
       GLuint client_id, GLuint service_id) {
     return program_manager()->CreateProgramInfo(client_id, service_id);
   }
 
   // Gets the program info for the given program. Returns NULL if none exists.
   ProgramManager::ProgramInfo* GetProgramInfo(GLuint client_id) {
     return program_manager()->GetProgramInfo(client_id);
   }
@@ skipping 5958 matching lines @@
   }
 
   if (!info->ValidForTexture(
           target, level, xoffset, yoffset, width, height, format, type)) {
     SetGLError(GL_INVALID_VALUE,
                "glTexSubImage2D: bad dimensions.");
     return;
   }
 
   // See if we can call glTexImage2D instead since it appears to be faster.
   if (teximage2d_faster_than_texsubimage2d_ && xoffset == 0 && yoffset == 0) {

[greggman, 2011/12/02 18:33:24]

You'll need to check the texture is not immutable (see below)

[vangelis, 2011/12/03 00:19:53]

Done.

     GLsizei tex_width = 0;
     GLsizei tex_height = 0;
     bool ok = info->GetLevelSize(target, level, &tex_width, &tex_height);
     DCHECK(ok);
     if (width == tex_width && height == tex_height) {
       // NOTE: In OpenGL ES 2.0 border is always zero and format is always the
       // same as internal_foramt. If that changes we'll need to look them up.
       WrappedTexImage2D(
           target, level, format, width, height, 0, format, type, data);
       texture_manager()->SetLevelCleared(info, target, level);
@@ skipping 934 matching lines @@
       feature_info_, info,
       target, 0, GL_RGBA, width, height, 1, 0,
       GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, true);
 
 #else
   SetGLError(GL_INVALID_OPERATION,
              "glTexImageIOSurface2DCHROMIUM: not supported.");
 #endif
 }
 
+static GLenum ExtractFormatFromStorageFormat(GLenum internalformat)
+{

[greggman, 2011/12/02 18:33:24]

This is not chromium style

should be

type function(args) {
  switch (value) {
    case CONST1:
      return value;
    case CONST2:
      return value;
   ...
   }
}

[vangelis, 2011/12/03 00:19:53]

Done.

+    switch (internalformat)
+    {
+      case GL_RGB565:                          return GL_RGB;
+      case GL_RGBA4:                           return GL_RGBA;
+      case GL_RGB5_A1:                         return GL_RGBA;
+      case GL_RGB8_OES:                        return GL_RGB;
+      case GL_RGBA8_OES:                       return GL_RGBA;
+      case GL_LUMINANCE8_ALPHA8_EXT:           return GL_LUMINANCE_ALPHA;
+      case GL_LUMINANCE8_EXT:                  return GL_LUMINANCE;
+      case GL_ALPHA8_EXT:                      return GL_ALPHA;
+      case GL_RGBA32F_EXT:                     return GL_RGBA;
+      case GL_RGB32F_EXT:                      return GL_RGB;
+      case GL_ALPHA32F_EXT:                    return GL_ALPHA;
+      case GL_LUMINANCE32F_EXT:                return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA32F_EXT:          return GL_LUMINANCE_ALPHA;
+      case GL_RGBA16F_EXT:                     return GL_RGBA;
+      case GL_RGB16F_EXT:                      return GL_RGB;
+      case GL_ALPHA16F_EXT:                    return GL_ALPHA;
+      case GL_LUMINANCE16F_EXT:                return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA16F_EXT:          return GL_LUMINANCE_ALPHA;
+      case GL_BGRA8_EXT:                       return GL_BGRA_EXT;
+      default:                                 return GL_NONE;   // Unsupported
+    }
+}
+
+GLenum ExtractTypeFromStorageFormat(GLenum internalformat)

[greggman, 2011/12/02 18:33:24]

style issues same as above. Should be static?

[vangelis, 2011/12/03 00:19:53]

Done and Done

+{
+    switch (internalformat)
+    {
+      case GL_RGB565:                          return GL_UNSIGNED_SHORT_5_6_5;
+      case GL_RGBA4:                           return GL_UNSIGNED_SHORT_4_4_4_4;
+      case GL_RGB5_A1:                         return GL_UNSIGNED_SHORT_5_5_5_1;
+      case GL_RGB8_OES:                        return GL_UNSIGNED_BYTE;
+      case GL_RGBA8_OES:                       return GL_UNSIGNED_BYTE;
+      case GL_LUMINANCE8_ALPHA8_EXT:           return GL_UNSIGNED_BYTE;
+      case GL_LUMINANCE8_EXT:                  return GL_UNSIGNED_BYTE;
+      case GL_ALPHA8_EXT:                      return GL_UNSIGNED_BYTE;
+      case GL_RGBA32F_EXT:                     return GL_FLOAT;
+      case GL_RGB32F_EXT:                      return GL_FLOAT;
+      case GL_ALPHA32F_EXT:                    return GL_FLOAT;
+      case GL_LUMINANCE32F_EXT:                return GL_FLOAT;
+      case GL_LUMINANCE_ALPHA32F_EXT:          return GL_FLOAT;
+      case GL_RGBA16F_EXT:                     return GL_HALF_FLOAT_OES;
+      case GL_RGB16F_EXT:                      return GL_HALF_FLOAT_OES;
+      case GL_ALPHA16F_EXT:                    return GL_HALF_FLOAT_OES;
+      case GL_LUMINANCE16F_EXT:                return GL_HALF_FLOAT_OES;
+      case GL_LUMINANCE_ALPHA16F_EXT:          return GL_HALF_FLOAT_OES;
+      case GL_BGRA8_EXT:                       return GL_UNSIGNED_BYTE;
+      default:                                 return GL_NONE;   // Unsupported
+    }
+}
+
+error::Error GLES2DecoderImpl::DoTexStorage2DEXT(

[greggman, 2011/12/02 18:33:24]

There's no reason for this to return an error. should be void.

[vangelis, 2011/12/03 00:19:53]

Done.

+  GLenum target,
+  GLint levels,
+  GLenum internal_format,
+  GLsizei width,
+  GLsizei height) {
+  if (!texture_manager()->ValidForTarget(
+        feature_info_, target, 1, width, height, 1) ||

[greggman, 2011/12/02 18:33:24]

the 1 after target should be 0

Also, you probably need to check that levels is correct for the given width and
height

There's a function, ComputeMipMapCount, in TextureManger.cc you could expose as
a static function on TextureManager

[vangelis, 2011/12/03 00:19:53]

Done.

+      texture_manager()->MaxLevelsForTarget(target) < levels) {
+    SetGLError(GL_INVALID_VALUE, "glTexStorage2DEXT: dimensions out of range");
+    return error::kNoError;
+  }
+  TextureManager::TextureInfo* info = GetTextureInfoForTarget(target);
+  if (!info) {
+    SetGLError(GL_INVALID_OPERATION,
+               "glTexStorage2DEXT: unknown texture for target");
+    return error::kNoError;
+  }
+  if (info->IsAttachedToFramebuffer()) {
+    state_dirty_ = true;
+  }
+
+  CopyRealGLErrorsToWrapper();
+  glTexStorage2DEXT(target, levels, internal_format, width, height);
+  GLenum error = PeekGLError();
+  if (error == GL_NO_ERROR) {
+    GLenum format = ExtractFormatFromStorageFormat(internal_format);
+    GLenum type = ExtractTypeFromStorageFormat(internal_format);
+    texture_manager()->SetLevelInfo(

[greggman, 2011/12/02 18:33:24]

I think you're going to need to add a field 'immutable' to
TextureManager::TextureInfo and set it here

[vangelis, 2011/12/03 00:19:53]

Good point.  Done.  I also added checks in the handlers for TexImage,
CompressedTexImage and CopyTexImage which according to the spec must return
INVALID_OPERATION if the texture is marked as immutable. 

+        feature_info_, info,
+        target, 0, format, width, height, 1, 0, format, type,
+        false);
+  }
+
+  texture_manager()->MarkMipmapsGenerated(feature_info_, info);

[greggman, 2011/12/02 18:33:24]

This should be inside the if. 

You should also consider changing MarkMipmapsGenerated so it takes another bool
arg "cleared"

Pass that value as the last argument to SetLevelInfo (I'll put a comment over
there)

Here you'd pass false. In DoGenerateMipmap you'd pass true.

[vangelis, 2011/12/03 00:19:53]

Done.

+
+  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