diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-11-02 23:58:27 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-11-02 23:58:27 +0000 |
| commit | 83a5c2bf63ef285dea096612f4d84236e9c8d543 (patch) | |
| tree | f5c9c2b4bdc0d2447d7ff8bf6bfaa30956db61d6 /src/glx/x11 | |
| parent | 7a28779b2e85bc346f0f3f4cda0d4f4e77d3719f (diff) | |
| download | external_mesa3d-83a5c2bf63ef285dea096612f4d84236e9c8d543.zip external_mesa3d-83a5c2bf63ef285dea096612f4d84236e9c8d543.tar.gz external_mesa3d-83a5c2bf63ef285dea096612f4d84236e9c8d543.tar.bz2 | |
Update gl_API.xml with OpenGL 2.0 functions, regenerate derived files.
Diffstat (limited to 'src/glx/x11')
| -rw-r--r-- | src/glx/x11/indirect.c | 2 | ||||
| -rw-r--r-- | src/glx/x11/indirect_vertex_array.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c index b62f2a3..b5c306c 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 5a5cd66..429b52a 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; |