diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-06 20:46:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-06 20:46:17 -0800 |
| commit | 16ac25b73a089e840e8d53cb3af3b6ff08ff54a3 (patch) | |
| tree | aea284df9df33af70aaa3987eb314327206777ca /opengl/tests | |
| parent | 8f3bc0c94473d90d0a68e251e96551d56e7039f8 (diff) | |
| parent | 168dfe71bfafebaa26b6f75df553f5fad7607669 (diff) | |
| download | frameworks_native-16ac25b73a089e840e8d53cb3af3b6ff08ff54a3.zip frameworks_native-16ac25b73a089e840e8d53cb3af3b6ff08ff54a3.tar.gz frameworks_native-16ac25b73a089e840e8d53cb3af3b6ff08ff54a3.tar.bz2 | |
am 168dfe71: am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '168dfe71bfafebaa26b6f75df553f5fad7607669':
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); |