Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: command_buffer/service/cross/gl/sampler_gl.h

Issue 332036: move all O3D specific command buffer stuff to command_buffer::o3d... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « command_buffer/service/cross/gl/render_surface_gl.cc ('k') | command_buffer/service/cross/gl/sampler_gl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: command_buffer/service/cross/gl/sampler_gl.h
===================================================================
--- command_buffer/service/cross/gl/sampler_gl.h (revision 30103)
+++ command_buffer/service/cross/gl/sampler_gl.h (working copy)
@@ -41,6 +41,7 @@
namespace o3d {
namespace command_buffer {
+namespace o3d {
class GAPIGL;
@@ -62,7 +63,7 @@
unsigned int max_anisotropy);
// Sets the border color states.
- void SetBorderColor(const RGBA &color);
+ void SetBorderColor(const o3d::RGBA &color);
// Sets the texture.
void SetTexture(ResourceId texture) { texture_id_ = texture; }
@@ -81,6 +82,7 @@
ResourceId texture_id_;
};
+} // namespace o3d
} // namespace command_buffer
} // namespace o3d
« no previous file with comments | « command_buffer/service/cross/gl/render_surface_gl.cc ('k') | command_buffer/service/cross/gl/sampler_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698