commit 0de980f75040096b7a1129bc86090f050301ceb8
author Yahan Zhou <yahan@google.com> Tue Apr 05 20:31:29 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 05 20:31:29 2022 +0000
tree ef67b6492039d09e66216ae37d43bfcaf5a6accf
parent ef819bde0c0e800be068c47c71c0c0ab3cf94e43
parent e212b4d8784ffdf744e80f6b8361eaaea70f212f

Identify samplerExternalOES in sampler array am: 9212a425a4 am: e212b4d878

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2055509

Change-Id: I82d986bf4d5a4dab4813d0b375579c1ae6cea6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

shared/OpenglCodecCommon/GLClientState.cpp

diff --git a/shared/OpenglCodecCommon/GLClientState.cpp b/shared/OpenglCodecCommon/GLClientState.cpp
index fc6f130..17c789e 100644
--- a/shared/OpenglCodecCommon/GLClientState.cpp
+++ b/shared/OpenglCodecCommon/GLClientState.cpp
@@ -1448,6 +1448,7 @@
     TextureRec* texrec = getTextureRec(texture);
     if (!texrec) {
         texrec = addTextureRec(texture, target);
+        first = GL_TRUE;
     }
 
     if (texture && target != texrec->target &&

shared/OpenglCodecCommon/GLSharedGroup.cpp

diff --git a/shared/OpenglCodecCommon/GLSharedGroup.cpp b/shared/OpenglCodecCommon/GLSharedGroup.cpp
index 6836d9b..30a1d4c 100755
--- a/shared/OpenglCodecCommon/GLSharedGroup.cpp
+++ b/shared/OpenglCodecCommon/GLSharedGroup.cpp
@@ -543,7 +543,7 @@
                 ShaderData::StringList::iterator nameEnd =
                     shader->samplerExternalNames.end();
                 while (nameIter != nameEnd) {
-                    if (*nameIter == name) {
+                    if (*nameIter == name || *nameIter + "[0]" == name) {
                         pData->setIndexFlags(
                             index,
                             ProgramData::INDEX_FLAG_SAMPLER_EXTERNAL);