diff options
Diffstat (limited to 'gpu/command_buffer/service/vertex_attrib_manager.cc')
-rw-r--r-- | gpu/command_buffer/service/vertex_attrib_manager.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/vertex_attrib_manager.cc b/gpu/command_buffer/service/vertex_attrib_manager.cc index 9bba30d..e1ae1c0 100644 --- a/gpu/command_buffer/service/vertex_attrib_manager.cc +++ b/gpu/command_buffer/service/vertex_attrib_manager.cc @@ -15,6 +15,7 @@ #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/buffer_manager.h" +#include "gpu/command_buffer/service/error_state.h" #include "gpu/command_buffer/service/feature_info.h" #include "gpu/command_buffer/service/gl_utils.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" @@ -166,6 +167,7 @@ bool VertexAttribManager::ValidateBindings( Program* current_program, GLuint max_vertex_accessed, GLsizei primcount) { + ErrorState* error_state = decoder->GetErrorState(); // true if any enabled, used divisor is zero bool divisor0 = false; const GLuint kInitialBufferId = 0xFFFFFFFFU; @@ -186,8 +188,8 @@ bool VertexAttribManager::ValidateBindings( GLuint count = attrib->MaxVertexAccessed(primcount, max_vertex_accessed); // This attrib is used in the current program. if (!attrib->CanAccess(count)) { - GLESDECODER_SET_GL_ERROR( - decoder, GL_INVALID_OPERATION, function_name, + ERRORSTATE_SET_GL_ERROR( + error_state, GL_INVALID_OPERATION, function_name, (std::string( "attempt to access out of range vertices in attribute ") + base::IntToString(attrib->index())).c_str()); @@ -231,8 +233,8 @@ bool VertexAttribManager::ValidateBindings( } else { // This attrib is not used in the current program. if (!attrib->buffer()) { - GLESDECODER_SET_GL_ERROR( - decoder, GL_INVALID_OPERATION, function_name, + ERRORSTATE_SET_GL_ERROR( + error_state, GL_INVALID_OPERATION, function_name, (std::string( "attempt to render with no buffer attached to " "enabled attribute ") + @@ -253,8 +255,8 @@ bool VertexAttribManager::ValidateBindings( } if (primcount && !divisor0) { - GLESDECODER_SET_GL_ERROR( - decoder, GL_INVALID_OPERATION, function_name, + ERRORSTATE_SET_GL_ERROR( + error_state, GL_INVALID_OPERATION, function_name, "attempt instanced render with all attributes having " "non-zero divisors"); return false; |