Mesa (master): vbo: use GLuint for numInstances to silence MSVC warnings

Brian Paul brianp at kemper.freedesktop.org
Tue Nov 6 15:11:32 UTC 2012


Module: Mesa
Branch: master
Commit: 15cb1a9029b8c9fb2c587f285b84d610bd9210ae
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=15cb1a9029b8c9fb2c587f285b84d610bd9210ae

Author: Brian Paul <brianp at vmware.com>
Date:   Sun Nov  4 16:43:44 2012 -0700

vbo: use GLuint for numInstances to silence MSVC warnings

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/mesa/vbo/vbo.h            |    2 +-
 src/mesa/vbo/vbo_exec_array.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index e058497..04930b9 100644
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -50,7 +50,7 @@ struct _mesa_prim {
    GLuint start;
    GLuint count;
    GLint basevertex;
-   GLsizei num_instances;
+   GLuint num_instances;
    GLuint base_instance;
 };
 
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index d857ac3..4b2c529 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -779,7 +779,7 @@ vbo_validated_drawrangeelements(struct gl_context *ctx, GLenum mode,
 				GLuint start, GLuint end,
 				GLsizei count, GLenum type,
 				const GLvoid *indices,
-				GLint basevertex, GLint numInstances,
+				GLint basevertex, GLuint numInstances,
 				GLuint baseInstance)
 {
    struct vbo_context *vbo = vbo_context(ctx);




More information about the mesa-commit mailing list