More work in Command Buffers...

command_buffer/service/win/d3d9/sampler_d3d9.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 26 matching lines @@
 #include "command_buffer/service/win/d3d9/texture_d3d9.h"
 
 namespace o3d {
 namespace command_buffer {
 
 namespace {
 
 // Converts an addressing mode to corresponding D3D values.
 D3DTEXTUREADDRESS AddressModeToD3D(sampler::AddressingMode mode) {
   switch (mode) {
-    case sampler::WRAP:
+    case sampler::kWrap:
       return D3DTADDRESS_WRAP;
-    case sampler::MIRROR_REPEAT:
+    case sampler::kMirrorRepeat:
       return D3DTADDRESS_MIRROR;
-    case sampler::CLAMP_TO_EDGE:
+    case sampler::kClampToEdge:
       return D3DTADDRESS_CLAMP;
-    case sampler::CLAMP_TO_BORDER:
+    case sampler::kClampToBorder:
       return D3DTADDRESS_BORDER;
   }
   DLOG(FATAL) << "Not reached";
   return D3DTADDRESS_WRAP;
 }
 
 // Converts a filtering mode to corresponding D3D values.
 D3DTEXTUREFILTERTYPE FilteringModeToD3D(sampler::FilteringMode mode) {
   switch (mode) {
-    case sampler::NONE:
+    case sampler::kNone:
       return D3DTEXF_NONE;
-    case sampler::POINT:
+    case sampler::kPoint:
       return D3DTEXF_POINT;
-    case sampler::LINEAR:
+    case sampler::kLinear:
       return D3DTEXF_LINEAR;
   }
   DLOG(FATAL) << "Not reached";
   return D3DTEXF_POINT;
 }
 
 }  // anonymous namespace
 
 SamplerD3D9::SamplerD3D9()
     : texture_id_(kInvalidResource) {
-  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 SamplerD3D9::ApplyStates(GAPID3D9 *gapi, unsigned int unit) const {
   DCHECK(gapi);
   TextureD3D9 *texture = gapi->GetTexture(texture_id_);
   if (!texture) {
     return false;
@@ skipping 13 matching lines @@
 }
 
 void SamplerD3D9::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, 0U);
   d3d_address_u_ = AddressModeToD3D(addressing_u);
   d3d_address_v_ = AddressModeToD3D(addressing_v);
   d3d_address_w_ = AddressModeToD3D(addressing_w);
   d3d_mag_filter_ = FilteringModeToD3D(mag_filter);
   d3d_min_filter_ = FilteringModeToD3D(min_filter);
   d3d_mip_filter_ = FilteringModeToD3D(mip_filter);
   if (max_anisotropy > 1) {
     d3d_mag_filter_ = D3DTEXF_ANISOTROPIC;
     d3d_min_filter_ = D3DTEXF_ANISOTROPIC;
   }
   d3d_max_anisotropy_ = max_anisotropy;
 }
 
 void SamplerD3D9::SetBorderColor(const RGBA &color) {
   d3d_border_color_ = RGBAToD3DCOLOR(color);
 }
 
 BufferSyncInterface::ParseError GAPID3D9::CreateSampler(
-    ResourceID id) {
+    ResourceId id) {
   // Dirty effect, because this sampler id may be used
   DirtyEffect();
   samplers_.Assign(id, new SamplerD3D9());
   return BufferSyncInterface::kParseNoError;
 }
 
 // Destroys the Sampler resource.
-BufferSyncInterface::ParseError GAPID3D9::DestroySampler(ResourceID id) {
+BufferSyncInterface::ParseError GAPID3D9::DestroySampler(ResourceId id) {
   // Dirty effect, because this sampler id may be used
   DirtyEffect();
   return samplers_.Destroy(id) ?
       BufferSyncInterface::kParseNoError :
       BufferSyncInterface::kParseInvalidArguments;
 }
 
 BufferSyncInterface::ParseError GAPID3D9::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) {
   SamplerD3D9 *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 GAPID3D9::SetSamplerBorderColor(
-    ResourceID id,
+    ResourceId id,
     const RGBA &color) {
   SamplerD3D9 *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 GAPID3D9::SetSamplerTexture(
-    ResourceID id,
-    ResourceID texture_id) {
+    ResourceId id,
+    ResourceId texture_id) {
   SamplerD3D9 *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