Index: gpu/command_buffer/service/gles2_cmd_decoder.cc |
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
index 772d6d497fa2defeef857045dd13b28267d9c4dd..535918deaa25ba43f4467eb6cf122a67095c39b7 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -982,9 +982,6 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>, |
// Helper for glGetBooleanv, glGetFloatv and glGetIntegerv |
bool GetHelper(GLenum pname, GLint* params, GLsizei* num_written); |
- // Same as GetHelper except for auto-generated state. |
- bool GetStateAsGLint(GLenum pname, GLint* params, GLsizei* num_written); |
- bool GetStateAsGLfloat(GLenum pname, GLfloat* params, GLsizei* num_written); |
// Wrapper for glCreateProgram |
bool CreateProgramHelper(GLuint client_id); |
@@ -3880,7 +3877,7 @@ bool GLES2DecoderImpl::GetHelper( |
bool GLES2DecoderImpl::GetNumValuesReturnedForGLGet( |
GLenum pname, GLsizei* num_values) { |
- if (GetStateAsGLint(pname, NULL, num_values)) { |
+ if (state_.GetStateAsGLint(pname, NULL, num_values)) { |
return true; |
} |
return GetHelper(pname, NULL, num_values); |
@@ -3891,7 +3888,7 @@ void GLES2DecoderImpl::DoGetBooleanv(GLenum pname, GLboolean* params) { |
GLsizei num_written = 0; |
if (GetNumValuesReturnedForGLGet(pname, &num_written)) { |
scoped_array<GLint> values(new GLint[num_written]); |
- if (!GetStateAsGLint(pname, values.get(), &num_written)) { |
+ if (!state_.GetStateAsGLint(pname, values.get(), &num_written)) { |
GetHelper(pname, values.get(), &num_written); |
} |
for (GLsizei ii = 0; ii < num_written; ++ii) { |
@@ -3905,7 +3902,7 @@ void GLES2DecoderImpl::DoGetBooleanv(GLenum pname, GLboolean* params) { |
void GLES2DecoderImpl::DoGetFloatv(GLenum pname, GLfloat* params) { |
DCHECK(params); |
GLsizei num_written = 0; |
- if (!GetStateAsGLfloat(pname, params, &num_written)) { |
+ if (!state_.GetStateAsGLfloat(pname, params, &num_written)) { |
if (GetHelper(pname, NULL, &num_written)) { |
scoped_array<GLint> values(new GLint[num_written]); |
GetHelper(pname, values.get(), &num_written); |
@@ -3921,7 +3918,7 @@ void GLES2DecoderImpl::DoGetFloatv(GLenum pname, GLfloat* params) { |
void GLES2DecoderImpl::DoGetIntegerv(GLenum pname, GLint* params) { |
DCHECK(params); |
GLsizei num_written; |
- if (!GetStateAsGLint(pname, params, &num_written) && |
+ if (!state_.GetStateAsGLint(pname, params, &num_written) && |
!GetHelper(pname, params, &num_written)) { |
glGetIntegerv(pname, params); |
} |
@@ -5857,6 +5854,10 @@ error::Error GLES2DecoderImpl::HandleGetShaderInfoLog( |
return error::kNoError; |
} |
+bool GLES2DecoderImpl::DoIsEnabled(GLenum cap) { |
+ return state_.GetEnabled(cap); |
+} |
+ |
bool GLES2DecoderImpl::DoIsBuffer(GLuint client_id) { |
const BufferManager::BufferInfo* buffer = GetBufferInfo(client_id); |
return buffer && buffer->IsValid() && !buffer->IsDeleted(); |
@@ -8422,7 +8423,7 @@ error::Error GLES2DecoderImpl::HandleGetMultipleIntegervCHROMIUM( |
GLint* start = results; |
for (GLuint ii = 0; ii < count; ++ii) { |
GLsizei num_written = 0; |
- if (!GetStateAsGLint(enums[ii], results, &num_written) && |
+ if (!state_.GetStateAsGLint(enums[ii], results, &num_written) && |
!GetHelper(enums[ii], results, &num_written)) { |
glGetIntegerv(enums[ii], results); |
} |