diff options
Diffstat (limited to 'chromium/gpu/command_buffer/service/vertex_attrib_manager.cc')
| -rw-r--r-- | chromium/gpu/command_buffer/service/vertex_attrib_manager.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/chromium/gpu/command_buffer/service/vertex_attrib_manager.cc b/chromium/gpu/command_buffer/service/vertex_attrib_manager.cc index 1112c5b3bb1..c9d89d40b08 100644 --- a/chromium/gpu/command_buffer/service/vertex_attrib_manager.cc +++ b/chromium/gpu/command_buffer/service/vertex_attrib_manager.cc @@ -234,15 +234,16 @@ void VertexAttribManager::SetIsBound(bool is_bound) { } } -bool VertexAttribManager::ValidateBindings( - const char* function_name, - GLES2Decoder* decoder, - FeatureInfo* feature_info, - BufferManager* buffer_manager, - Program* current_program, - GLuint max_vertex_accessed, - bool instanced, - GLsizei primcount) { +bool VertexAttribManager::ValidateBindings(const char* function_name, + GLES2Decoder* decoder, + FeatureInfo* feature_info, + BufferManager* buffer_manager, + Program* current_program, + GLuint max_vertex_accessed, + bool instanced, + GLsizei primcount, + GLint basevertex, + GLuint baseinstance) { DCHECK(primcount); ErrorState* error_state = decoder->GetErrorState(); // true if any enabled, used divisor is zero @@ -280,7 +281,8 @@ bool VertexAttribManager::ValidateBindings( if (attrib_info) { divisor0 |= (attrib->divisor() == 0); have_enabled_active_attribs = true; - GLuint count = attrib->MaxVertexAccessed(primcount, max_vertex_accessed); + GLuint count = attrib->MaxVertexAccessed(primcount, max_vertex_accessed, + basevertex, baseinstance); // This attrib is used in the current program. if (!attrib->CanAccess(count)) { ERRORSTATE_SET_GL_ERROR( |