More work in Command Buffers...

command_buffer/service/cross/gl/texture_gl.cc

 /*
  * Copyright 2009, Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 29 matching lines @@
 
 namespace {
 
 // Gets the GL internal format, format and type corresponding to a command
 // buffer texture format.
 bool GetGLFormatType(texture::Format format,
                      GLenum *internal_format,
                      GLenum *gl_format,
                      GLenum *gl_type) {
   switch (format) {
-    case texture::XRGB8:
+    case texture::kXRGB8:
       *internal_format = GL_RGB;
       *gl_format = GL_BGRA;
       *gl_type = GL_UNSIGNED_BYTE;
       return true;
-    case texture::ARGB8:
+    case texture::kARGB8:
       *internal_format = GL_RGBA;
       *gl_format = GL_BGRA;
       *gl_type = GL_UNSIGNED_BYTE;
       return true;
-    case texture::ABGR16F:
+    case texture::kABGR16F:
       *internal_format = GL_RGBA16F_ARB;
       *gl_format = GL_RGBA;
       *gl_type = GL_HALF_FLOAT_ARB;
       return true;
-    case texture::DXT1:
+    case texture::kDXT1:
       *internal_format = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
       *gl_format = 0;
       *gl_type = 0;
       return true;
     default:
       return false;
   }
 }
 
 // Helper class used to prepare image data to match the layout that
@@ skipping 437 matching lines @@
                                buffer.get());
       }
     }
     mip_side = std::max(1U, mip_side >> 1);
   }
   return new TextureCubeGL(
       levels, format, enable_render_surfaces, flags, side, gl_texture);
 }
 
 // Check that GL_TEXTURE_CUBE_MAP_POSITIVE_X + face yields the correct GLenum.
-COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::FACE_POSITIVE_X ==
+COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::kFacePositiveX ==
                GL_TEXTURE_CUBE_MAP_POSITIVE_X, POSITIVE_X_ENUMS_DO_NOT_MATCH);
-COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::FACE_NEGATIVE_X ==
+COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::kFaceNegativeX ==
                GL_TEXTURE_CUBE_MAP_NEGATIVE_X, NEGATIVE_X_ENUMS_DO_NOT_MATCH);
-COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::FACE_POSITIVE_Y ==
+COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::kFacePositiveY ==
                GL_TEXTURE_CUBE_MAP_POSITIVE_Y, POSITIVE_Y_ENUMS_DO_NOT_MATCH);
-COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::FACE_NEGATIVE_Y ==
+COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::kFaceNegativeY ==
                GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, NEGATIVE_Y_ENUMS_DO_NOT_MATCH);
-COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::FACE_POSITIVE_Z ==
+COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::kFacePositiveZ ==
                GL_TEXTURE_CUBE_MAP_POSITIVE_Z, POSITIVE_Z_ENUMS_DO_NOT_MATCH);
-COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::FACE_NEGATIVE_Z ==
+COMPILE_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_X + texture::kFaceNegativeZ ==
                GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, NEGATIVE_Z_ENUMS_DO_NOT_MATCH);
 
 bool TextureCubeGL::SetData(const Volume& volume,
                             unsigned int level,
                             texture::Face face,
                             unsigned int row_pitch,
                             unsigned int slice_pitch,
                             unsigned int size,
                             const void *data) {
   if (level >= levels())
@@ skipping 76 matching lines @@
     return false;
   }
 
   return true;
 }
 
 
 // GAPIGL functions.
 
 // Destroys a texture resource.
-BufferSyncInterface::ParseError GAPIGL::DestroyTexture(ResourceID id) {
+BufferSyncInterface::ParseError GAPIGL::DestroyTexture(ResourceId id) {
   // Dirty effect, because this texture id may be used.
   DirtyEffect();
   return textures_.Destroy(id) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
 }
 
 // Creates a 2D texture resource.
 BufferSyncInterface::ParseError GAPIGL::CreateTexture2D(
-    ResourceID id,
+    ResourceId id,
     unsigned int width,
     unsigned int height,
     unsigned int levels,
     texture::Format format,
     unsigned int flags,
     bool enable_render_surfaces) {
   Texture2DGL *texture = Texture2DGL::Create(
       width, height, levels, format, flags, enable_render_surfaces);
   if (!texture) return BufferSyncInterface::kParseInvalidArguments;
   // Dirty effect, because this texture id may be used.
   DirtyEffect();
   textures_.Assign(id, texture);
   return BufferSyncInterface::kParseNoError;
 }
 
 // Creates a 3D texture resource.
 BufferSyncInterface::ParseError GAPIGL::CreateTexture3D(
-    ResourceID id,
+    ResourceId id,
     unsigned int width,
     unsigned int height,
     unsigned int depth,
     unsigned int levels,
     texture::Format format,
     unsigned int flags,
     bool enable_render_surfaces) {
   Texture3DGL *texture = Texture3DGL::Create(
       width, height, depth, levels, format, flags, enable_render_surfaces);
   if (!texture) return BufferSyncInterface::kParseInvalidArguments;
   // Dirty effect, because this texture id may be used.
   DirtyEffect();
   textures_.Assign(id, texture);
   return BufferSyncInterface::kParseNoError;
 }
 
 // Creates a cube map texture resource.
 BufferSyncInterface::ParseError GAPIGL::CreateTextureCube(
-    ResourceID id,
+    ResourceId id,
     unsigned int side,
     unsigned int levels,
     texture::Format format,
     unsigned int flags,
     bool enable_render_surfaces) {
   TextureCubeGL *texture = TextureCubeGL::Create(
       side, levels, format, flags, enable_render_surfaces);
   if (!texture) return BufferSyncInterface::kParseInvalidArguments;
   // Dirty effect, because this texture id may be used.
   DirtyEffect();
   textures_.Assign(id, texture);
   return BufferSyncInterface::kParseNoError;
 }
 
 // Copies the data into a texture resource.
 BufferSyncInterface::ParseError GAPIGL::SetTextureData(
-    ResourceID id,
+    ResourceId id,
     unsigned int x,
     unsigned int y,
     unsigned int z,
     unsigned int width,
     unsigned int height,
     unsigned int depth,
     unsigned int level,
     texture::Face face,
     unsigned int row_pitch,
     unsigned int slice_pitch,
     unsigned int size,
     const void *data) {
   TextureGL *texture = textures_.Get(id);
   if (!texture)
     return BufferSyncInterface::kParseInvalidArguments;
   Volume volume = {x, y, z, width, height, depth};
   // Dirty effect: SetData may need to call glBindTexture which will mess up the
   // sampler parameters.
   DirtyEffect();
   return texture->SetData(volume, level, face, row_pitch, slice_pitch,
                           size, data) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
 }
 
 // Copies the data from a texture resource.
 BufferSyncInterface::ParseError GAPIGL::GetTextureData(
-    ResourceID id,
+    ResourceId id,
     unsigned int x,
     unsigned int y,
     unsigned int z,
     unsigned int width,
     unsigned int height,
     unsigned int depth,
     unsigned int level,
     texture::Face face,
     unsigned int row_pitch,
     unsigned int slice_pitch,
     unsigned int size,
     void *data) {
   TextureGL *texture = textures_.Get(id);
   if (!texture)
     return BufferSyncInterface::kParseInvalidArguments;
   Volume volume = {x, y, z, width, height, depth};
   // Dirty effect: GetData may need to call glBindTexture which will mess up the
   // sampler parameters.
   DirtyEffect();
   return texture->GetData(volume, level, face, row_pitch, slice_pitch,
                           size, data) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
 }
 
 }  // namespace command_buffer
 }  // namespace o3d