commit 460b412a727607583a799f51ed55678dcedda08d
author Yahan Zhou <yahan@google.com> Tue May 17 16:56:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 16:56:04 2016 +0000
tree 74408c65eaca84b3e787d16cf681d226f7a3e5e7
parent 921d0dbd51c59aa2354926d6df08bfa208ee8f7c
parent 4328493b4d1f441cf166d21bd84919557fe439fc

Merge "Sends tex coord only when the texture is enabled in gles1" into mnc-emu-dev

system/GLESv1_enc/GLEncoder.cpp

diff --git a/system/GLESv1_enc/GLEncoder.cpp b/system/GLESv1_enc/GLEncoder.cpp
index 4d1c24b..e4c03de 100644
--- a/system/GLESv1_enc/GLEncoder.cpp
+++ b/system/GLESv1_enc/GLEncoder.cpp
@@ -396,6 +396,7 @@
 void GLEncoder::sendVertexData(unsigned int first, unsigned int count)
 {
     assert(m_state != NULL);
+    GLenum prevActiveTexUnit = m_state->getActiveTextureUnit();
     for (int i = 0; i < GLClientState::LAST_LOCATION; i++) {
         bool enableDirty;
         const GLClientState::VertexAttribState *state = m_state->getStateAndEnableDirty(i, &enableDirty);
@@ -412,7 +413,6 @@
         }
 
         if (state->enabled) {
-
             if (enableDirty)
                 m_glEnableClientState_enc(this, state->glConst);
 
@@ -444,8 +444,11 @@
                 case GLClientState::TEXCOORD5_LOCATION:
                 case GLClientState::TEXCOORD6_LOCATION:
                 case GLClientState::TEXCOORD7_LOCATION:
-                    this->glTexCoordPointerData(this, i - GLClientState::TEXCOORD0_LOCATION, state->size, state->type, state->stride,
+                    m_state->setActiveTextureUnit(i - GLClientState::TEXCOORD0_LOCATION + GL_TEXTURE0);
+                    if (m_state->getPriorityEnabledTarget(GL_INVALID_ENUM) != GL_INVALID_ENUM) {
+                        this->glTexCoordPointerData(this, i - GLClientState::TEXCOORD0_LOCATION, state->size, state->type, state->stride,
                                                 (unsigned char *)state->data + firstIndex, datalen);
+                    }
                     break;
                 case GLClientState::POINTSIZE_LOCATION:
                     this->glPointSizePointerData(this, state->type, state->stride,
@@ -506,6 +509,7 @@
             this->m_glDisableClientState_enc(this, state->glConst);
         }
     }
+    m_state->setActiveTextureUnit(prevActiveTexUnit);
 }
 
 void GLEncoder::s_glDrawArrays(void *self, GLenum mode, GLint first, GLsizei count)