move all O3D specific command buffer stuff to command_buffer::o3d...

command_buffer/common/cross/gapi_interface.h

 /*
  * 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 20 matching lines @@
 
 
 // This file contains the interface class for the low-level graphics API
 // (GAPI).
 
 #ifndef O3D_COMMAND_BUFFER_COMMON_CROSS_GAPI_INTERFACE_H_
 #define O3D_COMMAND_BUFFER_COMMON_CROSS_GAPI_INTERFACE_H_
 
 #include "command_buffer/common/cross/constants.h"
 #include "command_buffer/common/cross/resource.h"
-#include "command_buffer/common/cross/cmd_buffer_format.h"
+#include "command_buffer/common/cross/o3d_cmd_format.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 // RBGA color definition.
 struct RGBA {
   float red;
   float green;
   float blue;
   float alpha;
 };
 
 // This class defines the low-level graphics API, as a pure interface class.
@@ skipping 765 matching lines @@
   //   parse_error::kParseInvalidArguments if invalid arguments are
   //   passed, parse_error::kParseNoError otherwise.
   virtual ParseError SetRenderSurface(ResourceId render_surface_id,
                                       ResourceId depth_stencil_id) = 0;
 
   // Switch the render surface and depth stencil surface back to the main
   // surfaces stored in the render
   virtual void SetBackSurfaces() = 0;
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_COMMON_CROSS_GAPI_INTERFACE_H_