From a59964ccae02f457374fba8008b083b4ae260f42 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Wed, 26 Dec 2012 22:20:43 +0200 Subject: [PATCH] Fixed function dependency typos. Added GL error check in VersionTest, for drivers that expose the deprecated function addresses and throw GL errors when used. --- .../org/lwjgl/test/opengl/VersionTest.java | 1 + .../org/lwjgl/opengl/ARB_texture_storage.java | 6 ++-- .../lwjgl/opengl/ARB_vertex_attrib_64bit.java | 2 +- .../lwjgl/opengl/EXT_direct_state_access.java | 6 ++-- .../lwjgl/opengl/EXT_vertex_attrib_64bit.java | 2 +- .../org/lwjgl/opengl/NV_gpu_shader5.java | 32 +++++++++---------- .../NV_vertex_attrib_integer_64bit.java | 2 +- 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/java/org/lwjgl/test/opengl/VersionTest.java b/src/java/org/lwjgl/test/opengl/VersionTest.java index 41c55f38..2255c5d4 100644 --- a/src/java/org/lwjgl/test/opengl/VersionTest.java +++ b/src/java/org/lwjgl/test/opengl/VersionTest.java @@ -120,6 +120,7 @@ public final class VersionTest { boolean deprecated = false; try { glVertex3f(0.0f, 0.0f, 0.0f); + Util.checkGLError(); deprecated = true; } catch (Throwable t) {} diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_storage.java b/src/templates/org/lwjgl/opengl/ARB_texture_storage.java index 1e61203f..73ff6377 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_storage.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_storage.java @@ -60,17 +60,17 @@ public interface ARB_texture_storage { @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glTextureStorage1DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels, @GLenum int internalformat, @GLsizei int width); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glTextureStorage2DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels, @GLenum int internalformat, @GLsizei int width, @GLsizei int height); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glTextureStorage3DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth); diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java b/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java index 2f55f34b..6e9748e3 100644 --- a/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java +++ b/src/templates/org/lwjgl/opengl/ARB_vertex_attrib_64bit.java @@ -93,7 +93,7 @@ public interface ARB_vertex_attrib_64bit { @StripPostfix("params") void glGetVertexAttribLdv(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glVertexArrayVertexAttribLOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset); } \ No newline at end of file diff --git a/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java b/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java index b4769ea3..d6402991 100644 --- a/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java +++ b/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java @@ -1353,13 +1353,13 @@ public interface EXT_direct_state_access { framebuffer" */ - @Dependent("GL_EXT_geometry_shader4,NV_geometry_program4") + @Dependent("GL_EXT_geometry_shader4,GL_NV_geometry_program4") void glNamedFramebufferTextureEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level); - @Dependent("GL_EXT_geometry_shader4,NV_geometry_program4") + @Dependent("GL_EXT_geometry_shader4,GL_NV_geometry_program4") void glNamedFramebufferTextureLayerEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level, int layer); - @Dependent("GL_EXT_geometry_shader4,NV_geometry_program4") + @Dependent("GL_EXT_geometry_shader4,GL_NV_geometry_program4") void glNamedFramebufferTextureFaceEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face); /* diff --git a/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java b/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java index 42755095..24ee4d83 100644 --- a/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java +++ b/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java @@ -83,7 +83,7 @@ public interface EXT_vertex_attrib_64bit { void glGetVertexAttribLdvEXT(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params); @Reuse("ARBVertexAttrib64bit") - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glVertexArrayVertexAttribLOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset); } \ No newline at end of file diff --git a/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java b/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java index 3b4a8994..5aef2002 100644 --- a/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java +++ b/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java @@ -127,59 +127,59 @@ public interface NV_gpu_shader5 { // ------------- - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform1i64NV(@GLuint int program, int location, @GLint64EXT long x); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform2i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform3i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform4i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z, @GLint64EXT long w); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform1i64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const @GLint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform2i64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const @GLint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform3i64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const @GLint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform4i64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const @GLint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform1ui64NV(@GLuint int program, int location, @GLuint64EXT long x); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform2ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform3ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") void glProgramUniform4ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z, @GLuint64EXT long w); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform1ui64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const @GLuint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform2ui64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const @GLuint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform3ui64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const @GLuint64EXT LongBuffer value); - @Dependent("EXT_direct_state_access") + @Dependent("GL_EXT_direct_state_access") @StripPostfix("value") void glProgramUniform4ui64vNV(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const @GLuint64EXT LongBuffer value); diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java b/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java index 7c10430f..0ea51270 100644 --- a/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java +++ b/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java @@ -92,7 +92,7 @@ public interface NV_vertex_attrib_integer_64bit { @StripPostfix("params") void glGetVertexAttribLui64vNV(@GLuint int index, @GLenum int pname, @OutParameter @GLuint64EXT @Check("4") LongBuffer params); - @Dependent("NV_vertex_buffer_unified_memory") + @Dependent("GL_NV_vertex_buffer_unified_memory") void glVertexAttribLFormatNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride); } \ No newline at end of file