diff options
| author | Wang Zhenyu <[email protected]> | 2006-12-04 15:48:04 +0800 |
|---|---|---|
| committer | Keith Packard <[email protected]> | 2007-01-06 15:49:23 -0800 |
| commit | caf8010652f77e7687c0a3b7c267ba49d0a24d74 (patch) | |
| tree | b21776131775e7ec72e5ab57c962226eaa755030 /src/glx/x11/indirect_vertex_array.c | |
| parent | f34cad0f972ca838cb223429acab54d26c2f6a57 (diff) | |
| parent | 8c1cc5fd8084e7a927b15c88709a615fa16b06a3 (diff) | |
Merge branch 'master' into crestline
Conflicts:
src/mesa/drivers/dri/i965/brw_tex_layout.c
Michel Dänzer replaced the copy of the 945 mipmap layout code with that from
the 945 driver directly.
Diffstat (limited to 'src/glx/x11/indirect_vertex_array.c')
| -rw-r--r-- | src/glx/x11/indirect_vertex_array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glx/x11/indirect_vertex_array.c b/src/glx/x11/indirect_vertex_array.c index 429b52ae635..1855547dced 100644 --- a/src/glx/x11/indirect_vertex_array.c +++ b/src/glx/x11/indirect_vertex_array.c @@ -527,7 +527,7 @@ static GLubyte * emit_DrawArrays_header_old( __GLXcontext * gc, struct array_state_vector * arrays, size_t * elements_per_request, - unsigned int * total_requests, + size_t * total_requests, GLenum mode, GLsizei count ) { size_t command_size; @@ -640,7 +640,7 @@ emit_DrawArrays_old( GLenum mode, GLint first, GLsizei count ) GLubyte * pc; size_t elements_per_request; - unsigned total_requests = 0; + size_t total_requests = 0; unsigned i; size_t total_sent = 0; @@ -770,7 +770,7 @@ emit_DrawElements_old( GLenum mode, GLsizei count, GLenum type, GLubyte * pc; size_t elements_per_request; - unsigned total_requests = 0; + size_t total_requests = 0; unsigned i; unsigned req; |