More work in Command Buffers...

command_buffer/service/cross/gl/sampler_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 25 matching lines @@
 #include "command_buffer/service/cross/gl/sampler_gl.h"
 
 namespace o3d {
 namespace command_buffer {
 
 namespace {
 
 // Gets the GL enum corresponding to an addressing mode.
 GLenum GLAddressMode(sampler::AddressingMode o3d_mode) {
   switch (o3d_mode) {
-    case sampler::WRAP:
+    case sampler::kWrap:
       return GL_REPEAT;
-    case sampler::MIRROR_REPEAT:
+    case sampler::kMirrorRepeat:
       return GL_MIRRORED_REPEAT;
-    case sampler::CLAMP_TO_EDGE:
+    case sampler::kClampToEdge:
       return GL_CLAMP_TO_EDGE;
-    case sampler::CLAMP_TO_BORDER:
+    case sampler::kClampToBorder:
       return GL_CLAMP_TO_BORDER;
     default:
       DLOG(FATAL) << "Not Reached";
       return GL_REPEAT;
   }
 }
 
 // Gets the GL enum for the minification filter based on the command buffer min
 // and mip filtering modes.
 GLenum GLMinFilter(sampler::FilteringMode min_filter,
                    sampler::FilteringMode mip_filter) {
   switch (min_filter) {
-    case sampler::POINT:
-      if (mip_filter == sampler::NONE)
+    case sampler::kPoint:
+      if (mip_filter == sampler::kNone)
         return GL_NEAREST;
-      else if (mip_filter == sampler::POINT)
+      else if (mip_filter == sampler::kPoint)
         return GL_NEAREST_MIPMAP_NEAREST;
-      else if (mip_filter == sampler::LINEAR)
+      else if (mip_filter == sampler::kLinear)
         return GL_NEAREST_MIPMAP_LINEAR;
-    case sampler::LINEAR:
-      if (mip_filter == sampler::NONE)
+    case sampler::kLinear:
+      if (mip_filter == sampler::kNone)
         return GL_LINEAR;
-      else if (mip_filter == sampler::POINT)
+      else if (mip_filter == sampler::kPoint)
         return GL_LINEAR_MIPMAP_NEAREST;
-      else if (mip_filter == sampler::LINEAR)
+      else if (mip_filter == sampler::kLinear)
         return GL_LINEAR_MIPMAP_LINEAR;
     default:
       DLOG(FATAL) << "Not Reached";
       return GL_LINEAR_MIPMAP_NEAREST;
   }
 }
 
 // Gets the GL enum for the magnification filter based on the command buffer mag
 // filtering mode.
 GLenum GLMagFilter(sampler::FilteringMode mag_filter) {
   switch (mag_filter) {
-    case sampler::POINT:
+    case sampler::kPoint:
       return GL_NEAREST;
-    case sampler::LINEAR:
+    case sampler::kLinear:
       return GL_LINEAR;
     default:
       DLOG(FATAL) << "Not Reached";
       return GL_LINEAR;
   }
 }
 
 // Gets the GL enum representing the GL target based on the texture type.
 GLenum GLTextureTarget(texture::Type type) {
   switch (type) {
-    case texture::TEXTURE_2D:
+    case texture::kTexture2d:
       return GL_TEXTURE_2D;
-    case texture::TEXTURE_3D:
+    case texture::kTexture3d:
       return GL_TEXTURE_3D;
-    case texture::TEXTURE_CUBE:
+    case texture::kTextureCube:
       return GL_TEXTURE_CUBE_MAP;
     default:
       DLOG(FATAL) << "Not Reached";
       return GL_TEXTURE_2D;
   }
 }
 
 }  // anonymous namespace
 
 SamplerGL::SamplerGL()
     : texture_id_(kInvalidResource),
       gl_texture_(0) {
-  SetStates(sampler::CLAMP_TO_EDGE,
-            sampler::CLAMP_TO_EDGE,
-            sampler::CLAMP_TO_EDGE,
-            sampler::LINEAR,
-            sampler::LINEAR,
-            sampler::POINT,
+  SetStates(sampler::kClampToEdge,
+            sampler::kClampToEdge,
+            sampler::kClampToEdge,
+            sampler::kLinear,
+            sampler::kLinear,
+            sampler::kPoint,
             1);
   RGBA black = {0, 0, 0, 1};
   SetBorderColor(black);
 }
 
 bool SamplerGL::ApplyStates(GAPIGL *gapi) {
   DCHECK(gapi);
   TextureGL *texture = gapi->GetTexture(texture_id_);
   if (!texture) {
     gl_texture_ = 0;
@@ skipping 13 matching lines @@
 }
 
 void SamplerGL::SetStates(sampler::AddressingMode addressing_u,
                           sampler::AddressingMode addressing_v,
                           sampler::AddressingMode addressing_w,
                           sampler::FilteringMode mag_filter,
                           sampler::FilteringMode min_filter,
                           sampler::FilteringMode mip_filter,
                           unsigned int max_anisotropy) {
   // These are validated in GAPIDecoder.cc
-  DCHECK_NE(mag_filter, sampler::NONE);
-  DCHECK_NE(min_filter, sampler::NONE);
+  DCHECK_NE(mag_filter, sampler::kNone);
+  DCHECK_NE(min_filter, sampler::kNone);
   DCHECK_GT(max_anisotropy, 0);
   gl_wrap_s_ = GLAddressMode(addressing_u);
   gl_wrap_t_ = GLAddressMode(addressing_v);
   gl_wrap_r_ = GLAddressMode(addressing_w);
   gl_mag_filter_ = GLMagFilter(mag_filter);
   gl_min_filter_ = GLMinFilter(min_filter, mip_filter);
   gl_max_anisotropy_ = max_anisotropy;
 }
 
 void SamplerGL::SetBorderColor(const RGBA &color) {
   gl_border_color_[0] = color.red;
   gl_border_color_[1] = color.green;
   gl_border_color_[2] = color.blue;
   gl_border_color_[3] = color.alpha;
 }
 
 BufferSyncInterface::ParseError GAPIGL::CreateSampler(
-    ResourceID id) {
+    ResourceId id) {
   // Dirty effect, because this sampler id may be used.
   DirtyEffect();
   samplers_.Assign(id, new SamplerGL());
   return BufferSyncInterface::kParseNoError;
 }
 
 // Destroys the Sampler resource.
-BufferSyncInterface::ParseError GAPIGL::DestroySampler(ResourceID id) {
+BufferSyncInterface::ParseError GAPIGL::DestroySampler(ResourceId id) {
   // Dirty effect, because this sampler id may be used.
   DirtyEffect();
   return samplers_.Destroy(id) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
 }
 
 BufferSyncInterface::ParseError GAPIGL::SetSamplerStates(
-    ResourceID id,
+    ResourceId id,
     sampler::AddressingMode addressing_u,
     sampler::AddressingMode addressing_v,
     sampler::AddressingMode addressing_w,
     sampler::FilteringMode mag_filter,
     sampler::FilteringMode min_filter,
     sampler::FilteringMode mip_filter,
     unsigned int max_anisotropy) {
   SamplerGL *sampler = samplers_.Get(id);
   if (!sampler)
     return BufferSyncInterface::kParseInvalidArguments;
   // Dirty effect, because this sampler id may be used.
   DirtyEffect();
   sampler->SetStates(addressing_u, addressing_v, addressing_w,
                      mag_filter, min_filter, mip_filter, max_anisotropy);
   return BufferSyncInterface::kParseNoError;
 }
 
 BufferSyncInterface::ParseError GAPIGL::SetSamplerBorderColor(
-    ResourceID id,
+    ResourceId id,
     const RGBA &color) {
   SamplerGL *sampler = samplers_.Get(id);
   if (!sampler)
     return BufferSyncInterface::kParseInvalidArguments;
   // Dirty effect, because this sampler id may be used.
   DirtyEffect();
   sampler->SetBorderColor(color);
   return BufferSyncInterface::kParseNoError;
 }
 
 BufferSyncInterface::ParseError GAPIGL::SetSamplerTexture(
-    ResourceID id,
-    ResourceID texture_id) {
+    ResourceId id,
+    ResourceId texture_id) {
   SamplerGL *sampler = samplers_.Get(id);
   if (!sampler)
     return BufferSyncInterface::kParseInvalidArguments;
   // Dirty effect, because this sampler id may be used.
   DirtyEffect();
   sampler->SetTexture(texture_id);
   return BufferSyncInterface::kParseNoError;
 }
 
 
 }  // namespace command_buffer
 }  // namespace o3d