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

Unified Diff: core/cross/command_buffer/sampler_cb.cc

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 | « core/cross/command_buffer/renderer_cb.cc ('k') | core/cross/command_buffer/states_cb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/cross/command_buffer/sampler_cb.cc
===================================================================
--- core/cross/command_buffer/sampler_cb.cc (revision 30103)
+++ core/cross/command_buffer/sampler_cb.cc (working copy)
@@ -36,7 +36,7 @@
#include "core/cross/error.h"
#include "core/cross/command_buffer/sampler_cb.h"
#include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/cross/cmd_buffer_format.h"
+#include "command_buffer/common/cross/o3d_cmd_format.h"
#include "command_buffer/client/cross/o3d_cmd_helper.h"
namespace o3d {
@@ -104,7 +104,7 @@
if (mag_filter_cb == sampler::kNone) mag_filter_cb = sampler::kPoint;
if (min_filter_cb == sampler::kNone) min_filter_cb = sampler::kPoint;
int max_max_anisotropy =
- command_buffer::cmd::SetSamplerStates::MaxAnisotropy::kMask;
+ command_buffer::o3d::SetSamplerStates::MaxAnisotropy::kMask;
unsigned int max_anisotropy_cb =
std::max(1, std::min(max_max_anisotropy, max_anisotropy()));
if (min_filter() != Sampler::ANISOTROPIC) {
« no previous file with comments | « core/cross/command_buffer/renderer_cb.cc ('k') | core/cross/command_buffer/states_cb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698