diff options
author | bohu <bohu@google.com> | 2014-10-14 17:30:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 17:30:18 +0000 |
commit | ca37eef61fa94932463f117ff1655a7e68f1827e (patch) | |
tree | 0329750a390b8053afff42a4fa0895c091685e30 /opengl | |
parent | 52df44c799657504405b47bddf813f353de98b1b (diff) | |
parent | 9c6d37269b85c41203a2f061958922315d55f6ce (diff) | |
download | android_device_generic_goldfish-ca37eef61fa94932463f117ff1655a7e68f1827e.tar.gz android_device_generic_goldfish-ca37eef61fa94932463f117ff1655a7e68f1827e.tar.bz2 android_device_generic_goldfish-ca37eef61fa94932463f117ff1655a7e68f1827e.zip |
am 9c6d3726: Merge "Fix emulator crashes on glDrawElements command"
* commit '9c6d37269b85c41203a2f061958922315d55f6ce':
Fix emulator crashes on glDrawElements command
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/system/GLESv2_enc/GL2Encoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp index 0f5abdd..305806e 100644 --- a/opengl/system/GLESv2_enc/GL2Encoder.cpp +++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp @@ -424,15 +424,15 @@ void GL2Encoder::sendVertexAttributes(GLint first, GLsizei count) int stride = state->stride == 0 ? state->elementSize : state->stride; int firstIndex = stride * first; + this->m_glBindBuffer_enc(this, GL_ARRAY_BUFFER, state->bufferObject); if (state->bufferObject == 0) { this->glVertexAttribPointerData(this, i, state->size, state->type, state->normalized, state->stride, (unsigned char *)state->data + firstIndex, datalen); } else { - this->m_glBindBuffer_enc(this, GL_ARRAY_BUFFER, state->bufferObject); this->glVertexAttribPointerOffset(this, i, state->size, state->type, state->normalized, state->stride, (uintptr_t) state->data + firstIndex); - this->m_glBindBuffer_enc(this, GL_ARRAY_BUFFER, m_state->currentArrayVbo()); } + this->m_glBindBuffer_enc(this, GL_ARRAY_BUFFER, m_state->currentArrayVbo()); } else { this->m_glDisableVertexAttribArray_enc(this, i); } |