summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2013-04-29 18:22:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-29 18:22:25 +0000
commit5075b21e1a0a0b5a8f054413df81469c07242d7c (patch)
treed9476d5994b0d8c6602a28ca43d89b1729c551e4 /opengl
parentb1b307ec3fb84fce09bd8af8ab5b755ba1957146 (diff)
parent42137d2e72cebb41f70c4a306877587fd0ea8c20 (diff)
downloadframeworks_native-5075b21e1a0a0b5a8f054413df81469c07242d7c.tar.gz
frameworks_native-5075b21e1a0a0b5a8f054413df81469c07242d7c.tar.bz2
frameworks_native-5075b21e1a0a0b5a8f054413df81469c07242d7c.zip
Merge "Fix range check"
Diffstat (limited to 'opengl')
-rw-r--r--opengl/tools/glgen/stubs/gles11/common.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/common.cpp b/opengl/tools/glgen/stubs/gles11/common.cpp
index 579d573ef..75b75cb7d 100644
--- a/opengl/tools/glgen/stubs/gles11/common.cpp
+++ b/opengl/tools/glgen/stubs/gles11/common.cpp
@@ -272,6 +272,7 @@ getarray
int _needed = 0;
params = (CTYPE *)getPointer(_env, params_buf, &_array, &_remaining, &_bufferOffset);
+ _remaining /= sizeof(CTYPE); // convert from bytes to item count
_needed = getNeededCount(pname);
// if we didn't find this pname, we just assume the user passed
// an array of the right size -- this might happen with extensions