summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-02 23:58:27 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-02 23:58:27 +0000
commit83a5c2bf63ef285dea096612f4d84236e9c8d543 (patch)
treef5c9c2b4bdc0d2447d7ff8bf6bfaa30956db61d6 /src/glx
parent7a28779b2e85bc346f0f3f4cda0d4f4e77d3719f (diff)
Update gl_API.xml with OpenGL 2.0 functions, regenerate derived files.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/x11/indirect.c2
-rw-r--r--src/glx/x11/indirect_vertex_array.c6
2 files changed, 3 insertions, 5 deletions
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 <GL/glxproto.h>
#ifdef USE_XCB
#include <X11/Xlib-xcb.h>
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;