summaryrefslogtreecommitdiffstats
path: root/opengl/libs/GLES_trace/src/gltrace_fixup.cpp
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-11-06 13:42:48 -0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-11-06 14:39:08 -0800
commit300ad09822db1013d9f28c4bca3680f865533ab6 (patch)
treeb8375a9ed175fc6625d85c9c586980292d3f0ab4 /opengl/libs/GLES_trace/src/gltrace_fixup.cpp
parent7abbbc680d03dd8e50a709f89b78ace6b81154b0 (diff)
downloadframeworks_native-300ad09822db1013d9f28c4bca3680f865533ab6.zip
frameworks_native-300ad09822db1013d9f28c4bca3680f865533ab6.tar.gz
frameworks_native-300ad09822db1013d9f28c4bca3680f865533ab6.tar.bz2
Fix return type of glGetAttribLocation and glGetUniformLocation
from int to GLint. See: http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
Diffstat (limited to 'opengl/libs/GLES_trace/src/gltrace_fixup.cpp')
-rw-r--r--opengl/libs/GLES_trace/src/gltrace_fixup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/GLES_trace/src/gltrace_fixup.cpp b/opengl/libs/GLES_trace/src/gltrace_fixup.cpp
index 3597b26..3932654 100644
--- a/opengl/libs/GLES_trace/src/gltrace_fixup.cpp
+++ b/opengl/libs/GLES_trace/src/gltrace_fixup.cpp
@@ -340,7 +340,7 @@ void fixup_glLinkProgram(GLMessage *glmsg) {
/** Given a glGetActive[Uniform|Attrib] call, obtain the location
* of the variable of given name in the call.
*/
-int getShaderVariableLocation(GLTraceContext *context, GLMessage *glmsg, GLchar *name) {
+GLint getShaderVariableLocation(GLTraceContext *context, GLMessage *glmsg, GLchar *name) {
GLMessage_Function func = glmsg->function();
if (func != GLMessage::glGetActiveAttrib && func != GLMessage::glGetActiveUniform) {
return -1;
@@ -373,7 +373,7 @@ void fixup_glGetActiveAttribOrUniform(GLTraceContext *context, GLMessage *glmsg,
// In order to make things simpler for the debugger, we also pass
// a hidden location argument that stores the actual location.
// append the location value to the end of the argument list
- int location = getShaderVariableLocation(context, glmsg, (GLchar*)pointersToFixup[3]);
+ GLint location = getShaderVariableLocation(context, glmsg, (GLchar*)pointersToFixup[3]);
GLMessage_DataType *arg_location = glmsg->add_args();
arg_location->set_isarray(false);
arg_location->set_type(GLMessage::DataType::INT);