More work in Command Buffers...

command_buffer/service/win/d3d9/gapi_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 164 matching lines @@
   // Release the back-buffer references.
   back_buffer_surface_ = NULL;
   back_buffer_depth_surface_ = NULL;
 }
 
 // Clears the selected buffers.
 void GAPID3D9::Clear(unsigned int buffers,
                      const RGBA &color,
                      float depth,
                      unsigned int stencil) {
-  DWORD flags = (buffers & COLOR ? D3DCLEAR_TARGET : 0) |
-                (buffers & DEPTH ? D3DCLEAR_ZBUFFER : 0) |
-                (buffers & STENCIL ? D3DCLEAR_STENCIL : 0);
+  DWORD flags = (buffers & kColor ? D3DCLEAR_TARGET : 0) |
+                (buffers & kDepth ? D3DCLEAR_ZBUFFER : 0) |
+                (buffers & kStencil ? D3DCLEAR_STENCIL : 0);
   HR(d3d_device_->Clear(0,
                         NULL,
                         flags,
                         D3DCOLOR_COLORVALUE(color.red,
                                             color.green,
                                             color.blue,
                                             color.alpha),
                         depth,
                         stencil));
 }
 
 // Sets the viewport.
 void GAPID3D9::SetViewport(unsigned int x,
                            unsigned int y,
                            unsigned int width,
                            unsigned int height,
                            float z_min,
                            float z_max) {
   D3DVIEWPORT9 viewport = {x, y, width, height, z_min, z_max};
   HR(d3d_device_->SetViewport(&viewport));
 }
 
 // Converts an unsigned int RGBA color into an unsigned int ARGB (DirectX)
 // color.
 static unsigned int RGBAToARGB(unsigned int rgba) {
   return (rgba >> 8) | (rgba << 24);
 }
 
 // Sets the current VertexStruct. Just keep track of the ID.
-BufferSyncInterface::ParseError GAPID3D9::SetVertexStruct(ResourceID id) {
+BufferSyncInterface::ParseError GAPID3D9::SetVertexStruct(ResourceId id) {
   current_vertex_struct_ = id;
   validate_streams_ = true;
   return BufferSyncInterface::kParseNoError;
 }
 
 // Sets in D3D the input streams of the current vertex struct.
 bool GAPID3D9::ValidateStreams() {
   DCHECK(validate_streams_);
   VertexStructD3D9 *vertex_struct = vertex_structs_.Get(current_vertex_struct_);
   if (!vertex_struct) {
     LOG(ERROR) << "Drawing with invalid streams.";
     return false;
   }
   max_vertices_ = vertex_struct->SetStreams(this);
   validate_streams_ = false;
   return max_vertices_ > 0;
 }
 
 // Converts a GAPID3D9::PrimitiveType to a D3DPRIMITIVETYPE.
-static D3DPRIMITIVETYPE D3DPrimitive(GAPID3D9::PrimitiveType primitive_type) {
+static D3DPRIMITIVETYPE D3DPrimitive(
+    command_buffer::PrimitiveType primitive_type) {
   switch (primitive_type) {
-    case GAPID3D9::POINTS:
+    case command_buffer::kPoints:
       return D3DPT_POINTLIST;
-    case GAPID3D9::LINES:
+    case command_buffer::kLines:
       return D3DPT_LINELIST;
-    case GAPID3D9::LINE_STRIPS:
+    case command_buffer::kLineStrips:
       return D3DPT_LINESTRIP;
-    case GAPID3D9::TRIANGLES:
+    case command_buffer::kTriangles:
       return D3DPT_TRIANGLELIST;
-    case GAPID3D9::TRIANGLE_STRIPS:
+    case command_buffer::kTriangleStrips:
       return D3DPT_TRIANGLESTRIP;
-    case GAPID3D9::TRIANGLE_FANS:
+    case command_buffer::kTriangleFans:
       return D3DPT_TRIANGLEFAN;
     default:
       LOG(FATAL) << "Invalid primitive type";
       return D3DPT_POINTLIST;
   }
 }
 
 // Draws with the current vertex struct.
 BufferSyncInterface::ParseError GAPID3D9::Draw(
     PrimitiveType primitive_type,
@@ skipping 15 matching lines @@
     // TODO: add proper error management
     return BufferSyncInterface::kParseInvalidArguments;
   }
   HR(d3d_device_->DrawPrimitive(D3DPrimitive(primitive_type), first, count));
   return BufferSyncInterface::kParseNoError;
 }
 
 // Draws with the current vertex struct.
 BufferSyncInterface::ParseError GAPID3D9::DrawIndexed(
     PrimitiveType primitive_type,
-    ResourceID index_buffer_id,
+    ResourceId index_buffer_id,
     unsigned int first,
     unsigned int count,
     unsigned int min_index,
     unsigned int max_index) {
   IndexBufferD3D9 *index_buffer = index_buffers_.Get(index_buffer_id);
   if (!index_buffer) return BufferSyncInterface::kParseInvalidArguments;
   if (validate_streams_ && !ValidateStreams()) {
     // TODO: add proper error management
     return BufferSyncInterface::kParseInvalidArguments;
   }
@@ skipping 12 matching lines @@
 
   HR(d3d_device_->SetIndices(index_buffer->d3d_index_buffer()));
   HR(d3d_device_->DrawIndexedPrimitive(D3DPrimitive(primitive_type), 0,
                                        min_index, max_index - min_index + 1,
                                        first, count));
   return BufferSyncInterface::kParseNoError;
 }
 
 }  // namespace command_buffer
 }  // namespace o3d