summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2004-04-29 08:14:19 +0000
committerKenneth Russel <[email protected]>2004-04-29 08:14:19 +0000
commit595577662881914de98204d0ef43e329e365d021 (patch)
treeb511c0b092d4dd5d5445abb80b00027c0cc0b8f6
parent89428de3de8c83eb4ece9a05a1ef5b2ef9cf7cd7 (diff)
Fixed breakage of vertex_array_range extension during last update of
OpenGL headers git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@127 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/stub_includes/opengl/GL/glext.h2
-rw-r--r--make/stub_includes/opengl/GL/glxext.h6
-rw-r--r--make/stub_includes/opengl/GL/wglext.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/make/stub_includes/opengl/GL/glext.h b/make/stub_includes/opengl/GL/glext.h
index e1ad5b3b6..94ad16e12 100644
--- a/make/stub_includes/opengl/GL/glext.h
+++ b/make/stub_includes/opengl/GL/glext.h
@@ -4826,6 +4826,8 @@ GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
#endif
+/* Hack to allow the platform-dependent routines to be picked up from other headers */
+#undef GL_NV_vertex_array_range
#ifndef GL_NV_register_combiners
#define GL_NV_register_combiners 1
diff --git a/make/stub_includes/opengl/GL/glxext.h b/make/stub_includes/opengl/GL/glxext.h
index 33522ce19..4de9955c5 100644
--- a/make/stub_includes/opengl/GL/glxext.h
+++ b/make/stub_includes/opengl/GL/glxext.h
@@ -610,8 +610,8 @@ typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, i
/*
* ???. GLX_NV_vertex_array_range
*/
-#ifndef GLX_NV_vertex_array_range
-#define GLX_NV_vertex_array_range 1
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
#ifdef GLX_GLXEXT_PROTOTYPES
extern GLvoid* glXAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
extern void glXFreeMemoryNV (GLvoid *pointer);
@@ -619,6 +619,8 @@ extern void glXFreeMemoryNV (GLvoid *pointer);
typedef GLvoid* ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
#endif
+/* Hack to allow the platform-independent routines to be picked up from other headers */
+#undef GL_NV_vertex_array_range
#ifdef __cplusplus
diff --git a/make/stub_includes/opengl/GL/wglext.h b/make/stub_includes/opengl/GL/wglext.h
index af10122fb..8541f4a47 100644
--- a/make/stub_includes/opengl/GL/wglext.h
+++ b/make/stub_includes/opengl/GL/wglext.h
@@ -475,8 +475,8 @@ typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
#define WGL_EXT_depth_float 1
#endif
-#ifndef WGL_NV_vertex_array_range
-#define WGL_NV_vertex_array_range 1
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
#ifdef WGL_WGLEXT_PROTOTYPES
extern void* WINAPI wglAllocateMemoryNV (GLsizei, GLfloat, GLfloat, GLfloat);
extern void WINAPI wglFreeMemoryNV (void *);
@@ -484,6 +484,8 @@ extern void WINAPI wglFreeMemoryNV (void *);
typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
#endif
+/* Hack to allow the platform-independent routines to be picked up from other headers */
+#undef GL_NV_vertex_array_range
#ifndef WGL_3DFX_multisample
#define WGL_3DFX_multisample 1