diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-06 20:41:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-06 20:41:34 -0800 |
| commit | 5e530e02bc3073a2e2469df3c333ae14f1b37433 (patch) | |
| tree | ce90daccf0b729c329acf5f193505da2be275d29 /opengl/tests | |
| parent | e2d4cc28d72db0d49e61ed4ceeb878436cafb23a (diff) | |
| parent | a151a19db2fa07295837027fb5d84c02401cc78d (diff) | |
| download | frameworks_native-5e530e02bc3073a2e2469df3c333ae14f1b37433.zip frameworks_native-5e530e02bc3073a2e2469df3c333ae14f1b37433.tar.gz frameworks_native-5e530e02bc3073a2e2469df3c333ae14f1b37433.tar.bz2 | |
am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
Fix return type of glGetAttribLocation and glGetUniformLocation
Diffstat (limited to 'opengl/tests')
| -rw-r--r-- | opengl/tests/gl_perf/fill_common.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opengl/tests/gl_perf/fill_common.cpp b/opengl/tests/gl_perf/fill_common.cpp index 389381f..fefedc0 100644 --- a/opengl/tests/gl_perf/fill_common.cpp +++ b/opengl/tests/gl_perf/fill_common.cpp @@ -189,7 +189,7 @@ static void setupVA() { } static void randUniform(int pgm, const char *var) { - int loc = glGetUniformLocation(pgm, var); + GLint loc = glGetUniformLocation(pgm, var); if (loc >= 0) { float x = ((float)rand()) / RAND_MAX; float y = ((float)rand()) / RAND_MAX; @@ -211,7 +211,7 @@ static void doLoop(bool warmup, int pgm, uint32_t passCount) { startTimer(); glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); for (uint32_t ct=0; ct < passCount; ct++) { - int loc = glGetUniformLocation(pgm, "u_texOff"); + GLint loc = glGetUniformLocation(pgm, "u_texOff"); glUniform2f(loc, ((float)ct) / passCount, ((float)ct) / 2.f / passCount); randUniform(pgm, "u_color"); @@ -271,7 +271,7 @@ static void doSingleTest(uint32_t pgmNum, int tex) { printf("error running test\n"); return; } - int loc = glGetUniformLocation(pgm, "u_tex0"); + GLint loc = glGetUniformLocation(pgm, "u_tex0"); if (loc >= 0) glUniform1i(loc, 0); loc = glGetUniformLocation(pgm, "u_tex1"); if (loc >= 0) glUniform1i(loc, 1); |