commit 72af3b2065ee6fd5cdac2a57ebec72558471bc0b
author Lingfeng Yang <lfy@google.com> Wed Apr 28 05:48:25 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 28 05:48:25 2021 +0000
tree 10556a09eaec9d0ac2628f6599dcd4301a2a33db
parent f115778869c50ccb7bec01a6a8f0097deeb7eb2b
parent d280758a2a6b29acfdaa9a27eeb6f5735395314a

Merge "Use GLint from client state parameters in glGetBooleanv"

system/GLESv2_enc/GL2Encoder.cpp

diff --git a/system/GLESv2_enc/GL2Encoder.cpp b/system/GLESv2_enc/GL2Encoder.cpp
index f4947bb..ecc0495 100755
--- a/system/GLESv2_enc/GL2Encoder.cpp
+++ b/system/GLESv2_enc/GL2Encoder.cpp
@@ -1109,10 +1109,14 @@
 
     default:
         if (!state) return;
-        if (!state->getClientStateParameter<GLboolean>(param, ptr)) {
-            ctx->safe_glGetBooleanv(param, ptr);
+        {
+            GLint intVal;
+            if (!state->getClientStateParameter<GLint>(param, &intVal)) {
+                ctx->safe_glGetBooleanv(param, ptr);
+            } else {
+                *ptr = (intVal != 0) ? GL_TRUE : GL_FALSE;
+            }
         }
-        *ptr = (*ptr != 0) ? GL_TRUE : GL_FALSE;
         break;
     }
 }