Index: command_buffer/service/cross/gl/sampler_gl.cc |
=================================================================== |
--- command_buffer/service/cross/gl/sampler_gl.cc (revision 26638) |
+++ command_buffer/service/cross/gl/sampler_gl.cc (working copy) |
@@ -175,7 +175,7 @@ |
// Dirty effect, because this sampler id may be used. |
DirtyEffect(); |
samplers_.Assign(id, new SamplerGL()); |
- return BufferSyncInterface::PARSE_NO_ERROR; |
+ return BufferSyncInterface::kParseNoError; |
} |
// Destroys the Sampler resource. |
@@ -183,8 +183,8 @@ |
// Dirty effect, because this sampler id may be used. |
DirtyEffect(); |
return samplers_.Destroy(id) ? |
- BufferSyncInterface::PARSE_NO_ERROR : |
- BufferSyncInterface::PARSE_INVALID_ARGUMENTS; |
+ BufferSyncInterface::kParseNoError : |
+ BufferSyncInterface::kParseInvalidArguments; |
} |
BufferSyncInterface::ParseError GAPIGL::SetSamplerStates( |
@@ -198,12 +198,12 @@ |
unsigned int max_anisotropy) { |
SamplerGL *sampler = samplers_.Get(id); |
if (!sampler) |
- return BufferSyncInterface::PARSE_INVALID_ARGUMENTS; |
+ 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::PARSE_NO_ERROR; |
+ return BufferSyncInterface::kParseNoError; |
} |
BufferSyncInterface::ParseError GAPIGL::SetSamplerBorderColor( |
@@ -211,11 +211,11 @@ |
const RGBA &color) { |
SamplerGL *sampler = samplers_.Get(id); |
if (!sampler) |
- return BufferSyncInterface::PARSE_INVALID_ARGUMENTS; |
+ return BufferSyncInterface::kParseInvalidArguments; |
// Dirty effect, because this sampler id may be used. |
DirtyEffect(); |
sampler->SetBorderColor(color); |
- return BufferSyncInterface::PARSE_NO_ERROR; |
+ return BufferSyncInterface::kParseNoError; |
} |
BufferSyncInterface::ParseError GAPIGL::SetSamplerTexture( |
@@ -223,11 +223,11 @@ |
ResourceID texture_id) { |
SamplerGL *sampler = samplers_.Get(id); |
if (!sampler) |
- return BufferSyncInterface::PARSE_INVALID_ARGUMENTS; |
+ return BufferSyncInterface::kParseInvalidArguments; |
// Dirty effect, because this sampler id may be used. |
DirtyEffect(); |
sampler->SetTexture(texture_id); |
- return BufferSyncInterface::PARSE_NO_ERROR; |
+ return BufferSyncInterface::kParseNoError; |
} |