summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2014-11-18 19:57:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-18 19:57:09 +0000
commitc2f8474518a220b3c1b86b6d4f9fa28ed9bb734a (patch)
tree805a1e935ef6c2c4d3a130867da2b46e39384127 /opengl
parent7041a479c7181b9b6caf27d471b5b7e36cefb46f (diff)
parent2c71ccd486a5c80a2ea159ce5ef3e62806471115 (diff)
downloadandroid_device_generic_goldfish-c2f8474518a220b3c1b86b6d4f9fa28ed9bb734a.tar.gz
android_device_generic_goldfish-c2f8474518a220b3c1b86b6d4f9fa28ed9bb734a.tar.bz2
android_device_generic_goldfish-c2f8474518a220b3c1b86b6d4f9fa28ed9bb734a.zip
Merge "handles glGetBooleanv when value is nonboolean"
Diffstat (limited to 'opengl')
-rw-r--r--opengl/system/GLESv2_enc/GL2Encoder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp
index 20e4063..0575935 100644
--- a/opengl/system/GLESv2_enc/GL2Encoder.cpp
+++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp
@@ -363,6 +363,7 @@ void GL2Encoder::s_glGetBooleanv(void *self, GLenum param, GLboolean *ptr)
if (!ctx->m_state->getClientStateParameter<GLboolean>(param, ptr)) {
ctx->m_glGetBooleanv_enc(self, param, ptr);
}
+ *ptr = (*ptr != 0) ? GL_TRUE : GL_FALSE;
break;
}
}