summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/queryobj.c
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-05-31 18:14:09 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-05-31 18:55:40 +0900
commit53174afeeb68a79e471185cb463c13ff90af698f (patch)
tree9e48b55cda10c585d7a7a5a2423df9c212dfede7 /src/mesa/main/queryobj.c
parent45b2c23d7a2f1bd723d0719b13470125de09c243 (diff)
downloadexternal_mesa3d-53174afeeb68a79e471185cb463c13ff90af698f.zip
external_mesa3d-53174afeeb68a79e471185cb463c13ff90af698f.tar.gz
external_mesa3d-53174afeeb68a79e471185cb463c13ff90af698f.tar.bz2
mesa: Apply MSVC portability fixes from Alan Hourihane.
Diffstat (limited to 'src/mesa/main/queryobj.c')
-rw-r--r--src/mesa/main/queryobj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index e30f548..a1e32e7 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -382,7 +382,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
*params = 0x7fffffff;
}
else {
- *params = q->Result;
+ *params = (GLint)q->Result;
}
break;
case GL_QUERY_RESULT_AVAILABLE_ARB:
@@ -422,7 +422,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
*params = 0xffffffff;
}
else {
- *params = q->Result;
+ *params = (GLuint)q->Result;
}
break;
case GL_QUERY_RESULT_AVAILABLE_ARB: