From 83a5c2bf63ef285dea096612f4d84236e9c8d543 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Nov 2006 23:58:27 +0000 Subject: Update gl_API.xml with OpenGL 2.0 functions, regenerate derived files. --- src/glx/x11/indirect.c | 2 +- src/glx/x11/indirect_vertex_array.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/glx/x11') diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c index b62f2a3a17..b5c306c562 100644 --- a/src/glx/x11/indirect.c +++ b/src/glx/x11/indirect.c @@ -31,8 +31,8 @@ #include "glxclient.h" #include "indirect_size.h" #include "dispatch.h" -#include "glthread.h" #include "glapi.h" +#include "glthread.h" #include #ifdef USE_XCB #include diff --git a/src/glx/x11/indirect_vertex_array.c b/src/glx/x11/indirect_vertex_array.c index 5a5cd6697e..429b52ae63 100644 --- a/src/glx/x11/indirect_vertex_array.c +++ b/src/glx/x11/indirect_vertex_array.c @@ -123,10 +123,8 @@ __glXInitVertexArrayState( __GLXcontext * gc ) struct array_state_vector * arrays; unsigned array_count; - unsigned texture_units = 1; - unsigned i; - unsigned j; - unsigned vertex_program_attribs = 0; + int texture_units = 1, vertex_program_attribs = 0; + unsigned i, j; GLboolean got_fog = GL_FALSE; GLboolean got_secondary_color = GL_FALSE; -- cgit v1.2.3