diff --git a/build.xml b/build.xml index 8b06d560..1c09a09b 100644 --- a/build.xml +++ b/build.xml @@ -173,6 +173,11 @@ + + + + + @@ -327,10 +332,14 @@ - - - - + + + + + + + + @@ -424,9 +433,9 @@ - + - + @@ -442,9 +451,9 @@ - + - + @@ -487,7 +496,7 @@ - + @@ -501,7 +510,7 @@ - + diff --git a/platform_build/win32_ms_cmdline/build.bat b/platform_build/win32_ms_cmdline/build.bat index fb1a8f74..3fb32f35 100644 --- a/platform_build/win32_ms_cmdline/build.bat +++ b/platform_build/win32_ms_cmdline/build.bat @@ -26,10 +26,7 @@ rem set LIBS=Kernel32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32. for %%x in (..\..\src\native\win32\*.c) do cl %COPTIONS% %%x for %%x in (..\..\src\native\common\*.c) do cl %COPTIONS% %%x -for %%x in (..\..\src\native\common\arb\*.c) do cl %COPTIONS% %%x -for %%x in (..\..\src\native\common\nv\*.c) do cl %COPTIONS% %%x -for %%x in (..\..\src\native\common\ext\*.c) do cl %COPTIONS% %%x -for %%x in (..\..\src\native\common\ati\*.c) do cl %COPTIONS% %%x +for %%x in (..\..\src\native\generated\*.c) do cl %COPTIONS% %%x cl /LD /Felwjgl.dll *.obj %LINKEROPTS% %LIBS% diff --git a/src/java/org/lwjgl/openal/AL10.java b/src/generated/org/lwjgl/openal/AL10.java similarity index 100% rename from src/java/org/lwjgl/openal/AL10.java rename to src/generated/org/lwjgl/openal/AL10.java diff --git a/src/java/org/lwjgl/opengl/ARBBufferObject.java b/src/generated/org/lwjgl/opengl/ARBBufferObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBBufferObject.java rename to src/generated/org/lwjgl/opengl/ARBBufferObject.java diff --git a/src/java/org/lwjgl/opengl/ARBColorBufferFloat.java b/src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBColorBufferFloat.java rename to src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java diff --git a/src/java/org/lwjgl/opengl/ARBDepthTexture.java b/src/generated/org/lwjgl/opengl/ARBDepthTexture.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBDepthTexture.java rename to src/generated/org/lwjgl/opengl/ARBDepthTexture.java diff --git a/src/java/org/lwjgl/opengl/ARBDrawBuffers.java b/src/generated/org/lwjgl/opengl/ARBDrawBuffers.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBDrawBuffers.java rename to src/generated/org/lwjgl/opengl/ARBDrawBuffers.java diff --git a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java b/src/generated/org/lwjgl/opengl/ARBFragmentProgram.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBFragmentProgram.java rename to src/generated/org/lwjgl/opengl/ARBFragmentProgram.java diff --git a/src/java/org/lwjgl/opengl/ARBFragmentShader.java b/src/generated/org/lwjgl/opengl/ARBFragmentShader.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBFragmentShader.java rename to src/generated/org/lwjgl/opengl/ARBFragmentShader.java diff --git a/src/java/org/lwjgl/opengl/ARBHalfFloatPixel.java b/src/generated/org/lwjgl/opengl/ARBHalfFloatPixel.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBHalfFloatPixel.java rename to src/generated/org/lwjgl/opengl/ARBHalfFloatPixel.java diff --git a/src/java/org/lwjgl/opengl/ARBImaging.java b/src/generated/org/lwjgl/opengl/ARBImaging.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBImaging.java rename to src/generated/org/lwjgl/opengl/ARBImaging.java diff --git a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java b/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBMatrixPalette.java rename to src/generated/org/lwjgl/opengl/ARBMatrixPalette.java diff --git a/src/java/org/lwjgl/opengl/ARBMultisample.java b/src/generated/org/lwjgl/opengl/ARBMultisample.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBMultisample.java rename to src/generated/org/lwjgl/opengl/ARBMultisample.java diff --git a/src/java/org/lwjgl/opengl/ARBMultitexture.java b/src/generated/org/lwjgl/opengl/ARBMultitexture.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBMultitexture.java rename to src/generated/org/lwjgl/opengl/ARBMultitexture.java diff --git a/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java b/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBOcclusionQuery.java rename to src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java diff --git a/src/java/org/lwjgl/opengl/ARBPixelBufferObject.java b/src/generated/org/lwjgl/opengl/ARBPixelBufferObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBPixelBufferObject.java rename to src/generated/org/lwjgl/opengl/ARBPixelBufferObject.java diff --git a/src/java/org/lwjgl/opengl/ARBPointParameters.java b/src/generated/org/lwjgl/opengl/ARBPointParameters.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBPointParameters.java rename to src/generated/org/lwjgl/opengl/ARBPointParameters.java diff --git a/src/java/org/lwjgl/opengl/ARBPointSprite.java b/src/generated/org/lwjgl/opengl/ARBPointSprite.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBPointSprite.java rename to src/generated/org/lwjgl/opengl/ARBPointSprite.java diff --git a/src/java/org/lwjgl/opengl/ARBProgram.java b/src/generated/org/lwjgl/opengl/ARBProgram.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBProgram.java rename to src/generated/org/lwjgl/opengl/ARBProgram.java diff --git a/src/java/org/lwjgl/opengl/ARBShaderObjects.java b/src/generated/org/lwjgl/opengl/ARBShaderObjects.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBShaderObjects.java rename to src/generated/org/lwjgl/opengl/ARBShaderObjects.java diff --git a/src/java/org/lwjgl/opengl/ARBShadingLanguage100.java b/src/generated/org/lwjgl/opengl/ARBShadingLanguage100.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBShadingLanguage100.java rename to src/generated/org/lwjgl/opengl/ARBShadingLanguage100.java diff --git a/src/java/org/lwjgl/opengl/ARBShadow.java b/src/generated/org/lwjgl/opengl/ARBShadow.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBShadow.java rename to src/generated/org/lwjgl/opengl/ARBShadow.java diff --git a/src/java/org/lwjgl/opengl/ARBShadowAmbient.java b/src/generated/org/lwjgl/opengl/ARBShadowAmbient.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBShadowAmbient.java rename to src/generated/org/lwjgl/opengl/ARBShadowAmbient.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java b/src/generated/org/lwjgl/opengl/ARBTextureBorderClamp.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java rename to src/generated/org/lwjgl/opengl/ARBTextureBorderClamp.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureCompression.java b/src/generated/org/lwjgl/opengl/ARBTextureCompression.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureCompression.java rename to src/generated/org/lwjgl/opengl/ARBTextureCompression.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureCubeMap.java b/src/generated/org/lwjgl/opengl/ARBTextureCubeMap.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureCubeMap.java rename to src/generated/org/lwjgl/opengl/ARBTextureCubeMap.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java b/src/generated/org/lwjgl/opengl/ARBTextureEnvCombine.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java rename to src/generated/org/lwjgl/opengl/ARBTextureEnvCombine.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java b/src/generated/org/lwjgl/opengl/ARBTextureEnvDot3.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java rename to src/generated/org/lwjgl/opengl/ARBTextureEnvDot3.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureFloat.java b/src/generated/org/lwjgl/opengl/ARBTextureFloat.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureFloat.java rename to src/generated/org/lwjgl/opengl/ARBTextureFloat.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java b/src/generated/org/lwjgl/opengl/ARBTextureMirroredRepeat.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java rename to src/generated/org/lwjgl/opengl/ARBTextureMirroredRepeat.java diff --git a/src/java/org/lwjgl/opengl/ARBTextureRectangle.java b/src/generated/org/lwjgl/opengl/ARBTextureRectangle.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTextureRectangle.java rename to src/generated/org/lwjgl/opengl/ARBTextureRectangle.java diff --git a/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java b/src/generated/org/lwjgl/opengl/ARBTransposeMatrix.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBTransposeMatrix.java rename to src/generated/org/lwjgl/opengl/ARBTransposeMatrix.java diff --git a/src/java/org/lwjgl/opengl/ARBVertexBlend.java b/src/generated/org/lwjgl/opengl/ARBVertexBlend.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBVertexBlend.java rename to src/generated/org/lwjgl/opengl/ARBVertexBlend.java diff --git a/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java b/src/generated/org/lwjgl/opengl/ARBVertexBufferObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBVertexBufferObject.java rename to src/generated/org/lwjgl/opengl/ARBVertexBufferObject.java diff --git a/src/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/generated/org/lwjgl/opengl/ARBVertexProgram.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBVertexProgram.java rename to src/generated/org/lwjgl/opengl/ARBVertexProgram.java diff --git a/src/java/org/lwjgl/opengl/ARBVertexShader.java b/src/generated/org/lwjgl/opengl/ARBVertexShader.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBVertexShader.java rename to src/generated/org/lwjgl/opengl/ARBVertexShader.java diff --git a/src/java/org/lwjgl/opengl/ARBWindowPos.java b/src/generated/org/lwjgl/opengl/ARBWindowPos.java similarity index 100% rename from src/java/org/lwjgl/opengl/ARBWindowPos.java rename to src/generated/org/lwjgl/opengl/ARBWindowPos.java diff --git a/src/java/org/lwjgl/opengl/ATIDrawBuffers.java b/src/generated/org/lwjgl/opengl/ATIDrawBuffers.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIDrawBuffers.java rename to src/generated/org/lwjgl/opengl/ATIDrawBuffers.java diff --git a/src/java/org/lwjgl/opengl/ATIElementArray.java b/src/generated/org/lwjgl/opengl/ATIElementArray.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIElementArray.java rename to src/generated/org/lwjgl/opengl/ATIElementArray.java diff --git a/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java b/src/generated/org/lwjgl/opengl/ATIEnvmapBumpmap.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java rename to src/generated/org/lwjgl/opengl/ATIEnvmapBumpmap.java diff --git a/src/java/org/lwjgl/opengl/ATIFragmentShader.java b/src/generated/org/lwjgl/opengl/ATIFragmentShader.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIFragmentShader.java rename to src/generated/org/lwjgl/opengl/ATIFragmentShader.java diff --git a/src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java b/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java rename to src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java diff --git a/src/java/org/lwjgl/opengl/ATIPnTriangles.java b/src/generated/org/lwjgl/opengl/ATIPnTriangles.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIPnTriangles.java rename to src/generated/org/lwjgl/opengl/ATIPnTriangles.java diff --git a/src/java/org/lwjgl/opengl/ATISeparateStencil.java b/src/generated/org/lwjgl/opengl/ATISeparateStencil.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATISeparateStencil.java rename to src/generated/org/lwjgl/opengl/ATISeparateStencil.java diff --git a/src/java/org/lwjgl/opengl/ATITextureCompression3DC.java b/src/generated/org/lwjgl/opengl/ATITextureCompression3DC.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATITextureCompression3DC.java rename to src/generated/org/lwjgl/opengl/ATITextureCompression3DC.java diff --git a/src/java/org/lwjgl/opengl/ATITextureFloat.java b/src/generated/org/lwjgl/opengl/ATITextureFloat.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATITextureFloat.java rename to src/generated/org/lwjgl/opengl/ATITextureFloat.java diff --git a/src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java b/src/generated/org/lwjgl/opengl/ATITextureMirrorOnce.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java rename to src/generated/org/lwjgl/opengl/ATITextureMirrorOnce.java diff --git a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java b/src/generated/org/lwjgl/opengl/ATIVertexArrayObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIVertexArrayObject.java rename to src/generated/org/lwjgl/opengl/ATIVertexArrayObject.java diff --git a/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java b/src/generated/org/lwjgl/opengl/ATIVertexAttribArrayObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java rename to src/generated/org/lwjgl/opengl/ATIVertexAttribArrayObject.java diff --git a/src/java/org/lwjgl/opengl/ATIVertexStreams.java b/src/generated/org/lwjgl/opengl/ATIVertexStreams.java similarity index 100% rename from src/java/org/lwjgl/opengl/ATIVertexStreams.java rename to src/generated/org/lwjgl/opengl/ATIVertexStreams.java diff --git a/src/java/org/lwjgl/opengl/ContextCapabilities.java b/src/generated/org/lwjgl/opengl/ContextCapabilities.java similarity index 99% rename from src/java/org/lwjgl/opengl/ContextCapabilities.java rename to src/generated/org/lwjgl/opengl/ContextCapabilities.java index 20cc4036..104b9908 100644 --- a/src/java/org/lwjgl/opengl/ContextCapabilities.java +++ b/src/generated/org/lwjgl/opengl/ContextCapabilities.java @@ -69,6 +69,7 @@ public class ContextCapabilities { public final boolean GL_EXT_fog_coord; public final boolean GL_EXT_framebuffer_object; public final boolean GL_EXT_multi_draw_arrays; + public final boolean GL_EXT_packed_depth_stencil; public final boolean GL_EXT_packed_pixels; public final boolean GL_EXT_paletted_texture; public final boolean GL_EXT_pixel_buffer_object; @@ -78,6 +79,7 @@ public class ContextCapabilities { public final boolean GL_EXT_separate_specular_color; public final boolean GL_EXT_shadow_funcs; public final boolean GL_EXT_shared_texture_palette; + public final boolean GL_EXT_stencil_clear_tag; public final boolean GL_EXT_stencil_two_side; public final boolean GL_EXT_stencil_wrap; public final boolean GL_EXT_texture_3d; @@ -88,6 +90,7 @@ public class ContextCapabilities { public final boolean GL_EXT_texture_lod_bias; public final boolean GL_EXT_texture_mirror_clamp; public final boolean GL_EXT_texture_rectangle; + public final boolean GL_EXT_texture_sRGB; public final boolean GL_EXT_vertex_shader; public final boolean GL_EXT_vertex_weighting; public final boolean OpenGL11; @@ -402,6 +405,7 @@ public class ContextCapabilities { long EXT_secondary_color_glSecondaryColor3fEXT_pointer; long EXT_secondary_color_glSecondaryColor3ubEXT_pointer; long EXT_secondary_color_glSecondaryColorPointerEXT_pointer; + long EXT_stencil_clear_tag_glStencilClearTagEXT_pointer; long EXT_stencil_two_side_glActiveStencilFaceEXT_pointer; long EXT_vertex_shader_glBeginVertexShaderEXT_pointer; long EXT_vertex_shader_glEndVertexShaderEXT_pointer; @@ -1297,6 +1301,11 @@ public class ContextCapabilities { (EXT_secondary_color_glSecondaryColorPointerEXT_pointer = GLContext.getFunctionAddress("glSecondaryColorPointerEXT")) != 0; } + private boolean EXT_stencil_clear_tag_initNativeFunctionAddresses() { + return + (EXT_stencil_clear_tag_glStencilClearTagEXT_pointer = GLContext.getFunctionAddress("glStencilClearTagEXT")) != 0; + } + private boolean EXT_stencil_two_side_initNativeFunctionAddresses() { return (EXT_stencil_two_side_glActiveStencilFaceEXT_pointer = GLContext.getFunctionAddress("glActiveStencilFaceEXT")) != 0; @@ -1945,6 +1954,8 @@ public class ContextCapabilities { supported_extensions.remove("GL_EXT_point_parameters"); if (supported_extensions.contains("GL_EXT_secondary_color") && !EXT_secondary_color_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_secondary_color"); + if (supported_extensions.contains("GL_EXT_stencil_clear_tag") && !EXT_stencil_clear_tag_initNativeFunctionAddresses()) + supported_extensions.remove("GL_EXT_stencil_clear_tag"); if (supported_extensions.contains("GL_EXT_stencil_two_side") && !EXT_stencil_two_side_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_stencil_two_side"); if (supported_extensions.contains("GL_EXT_vertex_shader") && !EXT_vertex_shader_initNativeFunctionAddresses()) @@ -2061,6 +2072,7 @@ public class ContextCapabilities { this.GL_EXT_fog_coord = supported_extensions.contains("GL_EXT_fog_coord"); this.GL_EXT_framebuffer_object = supported_extensions.contains("GL_EXT_framebuffer_object"); this.GL_EXT_multi_draw_arrays = supported_extensions.contains("GL_EXT_multi_draw_arrays"); + this.GL_EXT_packed_depth_stencil = supported_extensions.contains("GL_EXT_packed_depth_stencil"); this.GL_EXT_packed_pixels = supported_extensions.contains("GL_EXT_packed_pixels"); this.GL_EXT_paletted_texture = supported_extensions.contains("GL_EXT_paletted_texture"); this.GL_EXT_pixel_buffer_object = supported_extensions.contains("GL_EXT_pixel_buffer_object") @@ -2071,6 +2083,7 @@ public class ContextCapabilities { this.GL_EXT_separate_specular_color = supported_extensions.contains("GL_EXT_separate_specular_color"); this.GL_EXT_shadow_funcs = supported_extensions.contains("GL_EXT_shadow_funcs"); this.GL_EXT_shared_texture_palette = supported_extensions.contains("GL_EXT_shared_texture_palette"); + this.GL_EXT_stencil_clear_tag = supported_extensions.contains("GL_EXT_stencil_clear_tag"); this.GL_EXT_stencil_two_side = supported_extensions.contains("GL_EXT_stencil_two_side"); this.GL_EXT_stencil_wrap = supported_extensions.contains("GL_EXT_stencil_wrap"); this.GL_EXT_texture_3d = supported_extensions.contains("GL_EXT_texture_3d"); @@ -2081,6 +2094,7 @@ public class ContextCapabilities { this.GL_EXT_texture_lod_bias = supported_extensions.contains("GL_EXT_texture_lod_bias"); this.GL_EXT_texture_mirror_clamp = supported_extensions.contains("GL_EXT_texture_mirror_clamp"); this.GL_EXT_texture_rectangle = supported_extensions.contains("GL_EXT_texture_rectangle"); + this.GL_EXT_texture_sRGB = supported_extensions.contains("GL_EXT_texture_sRGB"); this.GL_EXT_vertex_shader = supported_extensions.contains("GL_EXT_vertex_shader"); this.GL_EXT_vertex_weighting = supported_extensions.contains("GL_EXT_vertex_weighting"); this.OpenGL11 = supported_extensions.contains("OpenGL11"); diff --git a/src/java/org/lwjgl/opengl/EXTAbgr.java b/src/generated/org/lwjgl/opengl/EXTAbgr.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTAbgr.java rename to src/generated/org/lwjgl/opengl/EXTAbgr.java diff --git a/src/java/org/lwjgl/opengl/EXTBgra.java b/src/generated/org/lwjgl/opengl/EXTBgra.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTBgra.java rename to src/generated/org/lwjgl/opengl/EXTBgra.java diff --git a/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java b/src/generated/org/lwjgl/opengl/EXTBlendEquationSeparate.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java rename to src/generated/org/lwjgl/opengl/EXTBlendEquationSeparate.java diff --git a/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java b/src/generated/org/lwjgl/opengl/EXTBlendFuncSeparate.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java rename to src/generated/org/lwjgl/opengl/EXTBlendFuncSeparate.java diff --git a/src/java/org/lwjgl/opengl/EXTBlendSubtract.java b/src/generated/org/lwjgl/opengl/EXTBlendSubtract.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTBlendSubtract.java rename to src/generated/org/lwjgl/opengl/EXTBlendSubtract.java diff --git a/src/java/org/lwjgl/opengl/EXTCgShader.java b/src/generated/org/lwjgl/opengl/EXTCgShader.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTCgShader.java rename to src/generated/org/lwjgl/opengl/EXTCgShader.java diff --git a/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java b/src/generated/org/lwjgl/opengl/EXTCompiledVertexArray.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java rename to src/generated/org/lwjgl/opengl/EXTCompiledVertexArray.java diff --git a/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java b/src/generated/org/lwjgl/opengl/EXTDepthBoundsTest.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java rename to src/generated/org/lwjgl/opengl/EXTDepthBoundsTest.java diff --git a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java b/src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTDrawRangeElements.java rename to src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java diff --git a/src/java/org/lwjgl/opengl/EXTFogCoord.java b/src/generated/org/lwjgl/opengl/EXTFogCoord.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTFogCoord.java rename to src/generated/org/lwjgl/opengl/EXTFogCoord.java diff --git a/src/java/org/lwjgl/opengl/EXTFramebufferObject.java b/src/generated/org/lwjgl/opengl/EXTFramebufferObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTFramebufferObject.java rename to src/generated/org/lwjgl/opengl/EXTFramebufferObject.java diff --git a/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java b/src/generated/org/lwjgl/opengl/EXTMultiDrawArrays.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java rename to src/generated/org/lwjgl/opengl/EXTMultiDrawArrays.java diff --git a/src/generated/org/lwjgl/opengl/EXTPackedDepthStencil.java b/src/generated/org/lwjgl/opengl/EXTPackedDepthStencil.java new file mode 100644 index 00000000..1f260164 --- /dev/null +++ b/src/generated/org/lwjgl/opengl/EXTPackedDepthStencil.java @@ -0,0 +1,18 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +package org.lwjgl.opengl; + +import org.lwjgl.LWJGLException; +import org.lwjgl.BufferChecks; +import java.nio.*; + +public final class EXTPackedDepthStencil { + public static final int GL_DEPTH_STENCIL_EXT = 0x84f9; + public static final int GL_UNSIGNED_INT_24_8_EXT = 0x84fa; + public static final int GL_DEPTH24_STENCIL8_EXT = 0x88f0; + public static final int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88f1; + + private EXTPackedDepthStencil() { + } + +} diff --git a/src/java/org/lwjgl/opengl/EXTPackedPixels.java b/src/generated/org/lwjgl/opengl/EXTPackedPixels.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTPackedPixels.java rename to src/generated/org/lwjgl/opengl/EXTPackedPixels.java diff --git a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java b/src/generated/org/lwjgl/opengl/EXTPalettedTexture.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTPalettedTexture.java rename to src/generated/org/lwjgl/opengl/EXTPalettedTexture.java diff --git a/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java b/src/generated/org/lwjgl/opengl/EXTPixelBufferObject.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTPixelBufferObject.java rename to src/generated/org/lwjgl/opengl/EXTPixelBufferObject.java diff --git a/src/java/org/lwjgl/opengl/EXTPointParameters.java b/src/generated/org/lwjgl/opengl/EXTPointParameters.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTPointParameters.java rename to src/generated/org/lwjgl/opengl/EXTPointParameters.java diff --git a/src/java/org/lwjgl/opengl/EXTRescaleNormal.java b/src/generated/org/lwjgl/opengl/EXTRescaleNormal.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTRescaleNormal.java rename to src/generated/org/lwjgl/opengl/EXTRescaleNormal.java diff --git a/src/java/org/lwjgl/opengl/EXTSecondaryColor.java b/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTSecondaryColor.java rename to src/generated/org/lwjgl/opengl/EXTSecondaryColor.java diff --git a/src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java b/src/generated/org/lwjgl/opengl/EXTSeparateSpecularColor.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java rename to src/generated/org/lwjgl/opengl/EXTSeparateSpecularColor.java diff --git a/src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java b/src/generated/org/lwjgl/opengl/EXTSharedTexturePalette.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java rename to src/generated/org/lwjgl/opengl/EXTSharedTexturePalette.java diff --git a/src/generated/org/lwjgl/opengl/EXTStencilClearTag.java b/src/generated/org/lwjgl/opengl/EXTStencilClearTag.java new file mode 100644 index 00000000..a5dea359 --- /dev/null +++ b/src/generated/org/lwjgl/opengl/EXTStencilClearTag.java @@ -0,0 +1,23 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +package org.lwjgl.opengl; + +import org.lwjgl.LWJGLException; +import org.lwjgl.BufferChecks; +import java.nio.*; + +public final class EXTStencilClearTag { + public static final int GL_STENCIL_TAG_BITS_EXT = 0x88f2; + public static final int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88f3; + + private EXTStencilClearTag() { + } + + + public static void glStencilClearTagEXT(int stencilTagBits, int stencilClearTag) { + long function_pointer = GLContext.getCapabilities().EXT_stencil_clear_tag_glStencilClearTagEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglStencilClearTagEXT(stencilTagBits, stencilClearTag, function_pointer); + } + private static native void nglStencilClearTagEXT(int stencilTagBits, int stencilClearTag, long function_pointer); +} diff --git a/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java b/src/generated/org/lwjgl/opengl/EXTStencilTwoSide.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTStencilTwoSide.java rename to src/generated/org/lwjgl/opengl/EXTStencilTwoSide.java diff --git a/src/java/org/lwjgl/opengl/EXTStencilWrap.java b/src/generated/org/lwjgl/opengl/EXTStencilWrap.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTStencilWrap.java rename to src/generated/org/lwjgl/opengl/EXTStencilWrap.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java b/src/generated/org/lwjgl/opengl/EXTTextureCompressionS3TC.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java rename to src/generated/org/lwjgl/opengl/EXTTextureCompressionS3TC.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java b/src/generated/org/lwjgl/opengl/EXTTextureEnvCombine.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java rename to src/generated/org/lwjgl/opengl/EXTTextureEnvCombine.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java b/src/generated/org/lwjgl/opengl/EXTTextureEnvDot3.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java rename to src/generated/org/lwjgl/opengl/EXTTextureEnvDot3.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java b/src/generated/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java rename to src/generated/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureLODBias.java b/src/generated/org/lwjgl/opengl/EXTTextureLODBias.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureLODBias.java rename to src/generated/org/lwjgl/opengl/EXTTextureLODBias.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java b/src/generated/org/lwjgl/opengl/EXTTextureMirrorClamp.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java rename to src/generated/org/lwjgl/opengl/EXTTextureMirrorClamp.java diff --git a/src/java/org/lwjgl/opengl/EXTTextureRectangle.java b/src/generated/org/lwjgl/opengl/EXTTextureRectangle.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTTextureRectangle.java rename to src/generated/org/lwjgl/opengl/EXTTextureRectangle.java diff --git a/src/generated/org/lwjgl/opengl/EXTTextureSRGB.java b/src/generated/org/lwjgl/opengl/EXTTextureSRGB.java new file mode 100644 index 00000000..f8a226fb --- /dev/null +++ b/src/generated/org/lwjgl/opengl/EXTTextureSRGB.java @@ -0,0 +1,30 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +package org.lwjgl.opengl; + +import org.lwjgl.LWJGLException; +import org.lwjgl.BufferChecks; +import java.nio.*; + +public final class EXTTextureSRGB { + public static final int GL_SRGB_EXT = 0x8c40; + public static final int GL_SRGB8_EXT = 0x8c41; + public static final int GL_SRGB_ALPHA_EXT = 0x8c42; + public static final int GL_SRGB8_ALPHA8_EXT = 0x8c43; + public static final int GL_SLUMINANCE_ALPHA_EXT = 0x8c44; + public static final int GL_SLUMINANCE8_ALPHA8_EXT = 0x8c45; + public static final int GL_SLUMINANCE_EXT = 0x8c46; + public static final int GL_SLUMINANCE8_EXT = 0x8c47; + public static final int GL_COMPRESSED_SRGB_EXT = 0x8c48; + public static final int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8c49; + public static final int GL_COMPRESSED_SLUMINANCE_EXT = 0x8c4a; + public static final int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8c4b; + public static final int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8c4c; + public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8c4d; + public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8c4e; + public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8c4f; + + private EXTTextureSRGB() { + } + +} diff --git a/src/java/org/lwjgl/opengl/EXTVertexShader.java b/src/generated/org/lwjgl/opengl/EXTVertexShader.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTVertexShader.java rename to src/generated/org/lwjgl/opengl/EXTVertexShader.java diff --git a/src/java/org/lwjgl/opengl/EXTVertexWeighting.java b/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java similarity index 100% rename from src/java/org/lwjgl/opengl/EXTVertexWeighting.java rename to src/generated/org/lwjgl/opengl/EXTVertexWeighting.java diff --git a/src/java/org/lwjgl/opengl/GL11.java b/src/generated/org/lwjgl/opengl/GL11.java similarity index 100% rename from src/java/org/lwjgl/opengl/GL11.java rename to src/generated/org/lwjgl/opengl/GL11.java diff --git a/src/java/org/lwjgl/opengl/GL12.java b/src/generated/org/lwjgl/opengl/GL12.java similarity index 100% rename from src/java/org/lwjgl/opengl/GL12.java rename to src/generated/org/lwjgl/opengl/GL12.java diff --git a/src/java/org/lwjgl/opengl/GL13.java b/src/generated/org/lwjgl/opengl/GL13.java similarity index 100% rename from src/java/org/lwjgl/opengl/GL13.java rename to src/generated/org/lwjgl/opengl/GL13.java diff --git a/src/java/org/lwjgl/opengl/GL14.java b/src/generated/org/lwjgl/opengl/GL14.java similarity index 100% rename from src/java/org/lwjgl/opengl/GL14.java rename to src/generated/org/lwjgl/opengl/GL14.java diff --git a/src/java/org/lwjgl/opengl/GL15.java b/src/generated/org/lwjgl/opengl/GL15.java similarity index 100% rename from src/java/org/lwjgl/opengl/GL15.java rename to src/generated/org/lwjgl/opengl/GL15.java diff --git a/src/java/org/lwjgl/opengl/GL20.java b/src/generated/org/lwjgl/opengl/GL20.java similarity index 100% rename from src/java/org/lwjgl/opengl/GL20.java rename to src/generated/org/lwjgl/opengl/GL20.java diff --git a/src/java/org/lwjgl/opengl/HPOcclusionTest.java b/src/generated/org/lwjgl/opengl/HPOcclusionTest.java similarity index 100% rename from src/java/org/lwjgl/opengl/HPOcclusionTest.java rename to src/generated/org/lwjgl/opengl/HPOcclusionTest.java diff --git a/src/java/org/lwjgl/opengl/IBMRasterposClip.java b/src/generated/org/lwjgl/opengl/IBMRasterposClip.java similarity index 100% rename from src/java/org/lwjgl/opengl/IBMRasterposClip.java rename to src/generated/org/lwjgl/opengl/IBMRasterposClip.java diff --git a/src/java/org/lwjgl/opengl/NVCopyDepthToColor.java b/src/generated/org/lwjgl/opengl/NVCopyDepthToColor.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVCopyDepthToColor.java rename to src/generated/org/lwjgl/opengl/NVCopyDepthToColor.java diff --git a/src/java/org/lwjgl/opengl/NVDepthClamp.java b/src/generated/org/lwjgl/opengl/NVDepthClamp.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVDepthClamp.java rename to src/generated/org/lwjgl/opengl/NVDepthClamp.java diff --git a/src/java/org/lwjgl/opengl/NVEvaluators.java b/src/generated/org/lwjgl/opengl/NVEvaluators.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVEvaluators.java rename to src/generated/org/lwjgl/opengl/NVEvaluators.java diff --git a/src/java/org/lwjgl/opengl/NVFence.java b/src/generated/org/lwjgl/opengl/NVFence.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVFence.java rename to src/generated/org/lwjgl/opengl/NVFence.java diff --git a/src/java/org/lwjgl/opengl/NVFloatBuffer.java b/src/generated/org/lwjgl/opengl/NVFloatBuffer.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVFloatBuffer.java rename to src/generated/org/lwjgl/opengl/NVFloatBuffer.java diff --git a/src/java/org/lwjgl/opengl/NVFogDistance.java b/src/generated/org/lwjgl/opengl/NVFogDistance.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVFogDistance.java rename to src/generated/org/lwjgl/opengl/NVFogDistance.java diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram.java b/src/generated/org/lwjgl/opengl/NVFragmentProgram.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVFragmentProgram.java rename to src/generated/org/lwjgl/opengl/NVFragmentProgram.java diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram2.java b/src/generated/org/lwjgl/opengl/NVFragmentProgram2.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVFragmentProgram2.java rename to src/generated/org/lwjgl/opengl/NVFragmentProgram2.java diff --git a/src/java/org/lwjgl/opengl/NVHalfFloat.java b/src/generated/org/lwjgl/opengl/NVHalfFloat.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVHalfFloat.java rename to src/generated/org/lwjgl/opengl/NVHalfFloat.java diff --git a/src/java/org/lwjgl/opengl/NVLightMaxExponent.java b/src/generated/org/lwjgl/opengl/NVLightMaxExponent.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVLightMaxExponent.java rename to src/generated/org/lwjgl/opengl/NVLightMaxExponent.java diff --git a/src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java b/src/generated/org/lwjgl/opengl/NVMultisampleFilterHint.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java rename to src/generated/org/lwjgl/opengl/NVMultisampleFilterHint.java diff --git a/src/java/org/lwjgl/opengl/NVOcclusionQuery.java b/src/generated/org/lwjgl/opengl/NVOcclusionQuery.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVOcclusionQuery.java rename to src/generated/org/lwjgl/opengl/NVOcclusionQuery.java diff --git a/src/java/org/lwjgl/opengl/NVPackedDepthStencil.java b/src/generated/org/lwjgl/opengl/NVPackedDepthStencil.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVPackedDepthStencil.java rename to src/generated/org/lwjgl/opengl/NVPackedDepthStencil.java diff --git a/src/java/org/lwjgl/opengl/NVPixelDataRange.java b/src/generated/org/lwjgl/opengl/NVPixelDataRange.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVPixelDataRange.java rename to src/generated/org/lwjgl/opengl/NVPixelDataRange.java diff --git a/src/java/org/lwjgl/opengl/NVPointSprite.java b/src/generated/org/lwjgl/opengl/NVPointSprite.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVPointSprite.java rename to src/generated/org/lwjgl/opengl/NVPointSprite.java diff --git a/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java b/src/generated/org/lwjgl/opengl/NVPrimitiveRestart.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVPrimitiveRestart.java rename to src/generated/org/lwjgl/opengl/NVPrimitiveRestart.java diff --git a/src/java/org/lwjgl/opengl/NVProgram.java b/src/generated/org/lwjgl/opengl/NVProgram.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVProgram.java rename to src/generated/org/lwjgl/opengl/NVProgram.java diff --git a/src/java/org/lwjgl/opengl/NVRegisterCombiners.java b/src/generated/org/lwjgl/opengl/NVRegisterCombiners.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVRegisterCombiners.java rename to src/generated/org/lwjgl/opengl/NVRegisterCombiners.java diff --git a/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java b/src/generated/org/lwjgl/opengl/NVRegisterCombiners2.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVRegisterCombiners2.java rename to src/generated/org/lwjgl/opengl/NVRegisterCombiners2.java diff --git a/src/java/org/lwjgl/opengl/NVTexgenReflection.java b/src/generated/org/lwjgl/opengl/NVTexgenReflection.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTexgenReflection.java rename to src/generated/org/lwjgl/opengl/NVTexgenReflection.java diff --git a/src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java b/src/generated/org/lwjgl/opengl/NVTextureCompressionVTC.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java rename to src/generated/org/lwjgl/opengl/NVTextureCompressionVTC.java diff --git a/src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java b/src/generated/org/lwjgl/opengl/NVTextureEnvCombine4.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java rename to src/generated/org/lwjgl/opengl/NVTextureEnvCombine4.java diff --git a/src/java/org/lwjgl/opengl/NVTextureExpandNormal.java b/src/generated/org/lwjgl/opengl/NVTextureExpandNormal.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureExpandNormal.java rename to src/generated/org/lwjgl/opengl/NVTextureExpandNormal.java diff --git a/src/java/org/lwjgl/opengl/NVTextureRectangle.java b/src/generated/org/lwjgl/opengl/NVTextureRectangle.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureRectangle.java rename to src/generated/org/lwjgl/opengl/NVTextureRectangle.java diff --git a/src/java/org/lwjgl/opengl/NVTextureShader.java b/src/generated/org/lwjgl/opengl/NVTextureShader.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureShader.java rename to src/generated/org/lwjgl/opengl/NVTextureShader.java diff --git a/src/java/org/lwjgl/opengl/NVTextureShader2.java b/src/generated/org/lwjgl/opengl/NVTextureShader2.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureShader2.java rename to src/generated/org/lwjgl/opengl/NVTextureShader2.java diff --git a/src/java/org/lwjgl/opengl/NVTextureShader3.java b/src/generated/org/lwjgl/opengl/NVTextureShader3.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVTextureShader3.java rename to src/generated/org/lwjgl/opengl/NVTextureShader3.java diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java b/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVVertexArrayRange.java rename to src/generated/org/lwjgl/opengl/NVVertexArrayRange.java diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange2.java b/src/generated/org/lwjgl/opengl/NVVertexArrayRange2.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVVertexArrayRange2.java rename to src/generated/org/lwjgl/opengl/NVVertexArrayRange2.java diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram.java b/src/generated/org/lwjgl/opengl/NVVertexProgram.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVVertexProgram.java rename to src/generated/org/lwjgl/opengl/NVVertexProgram.java diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram2Option.java b/src/generated/org/lwjgl/opengl/NVVertexProgram2Option.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVVertexProgram2Option.java rename to src/generated/org/lwjgl/opengl/NVVertexProgram2Option.java diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram3.java b/src/generated/org/lwjgl/opengl/NVVertexProgram3.java similarity index 100% rename from src/java/org/lwjgl/opengl/NVVertexProgram3.java rename to src/generated/org/lwjgl/opengl/NVVertexProgram3.java diff --git a/src/java/org/lwjgl/opengl/References.java b/src/generated/org/lwjgl/opengl/References.java similarity index 100% rename from src/java/org/lwjgl/opengl/References.java rename to src/generated/org/lwjgl/opengl/References.java diff --git a/src/java/org/lwjgl/opengl/SUNSliceAccum.java b/src/generated/org/lwjgl/opengl/SUNSliceAccum.java similarity index 100% rename from src/java/org/lwjgl/opengl/SUNSliceAccum.java rename to src/generated/org/lwjgl/opengl/SUNSliceAccum.java diff --git a/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java b/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java index a5f306d1..4444b3c4 100644 --- a/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java +++ b/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java @@ -105,7 +105,7 @@ public class ContextGeneratorProcessorFactory implements AnnotationProcessorFact } private void generateContextCapabilitiesSource(boolean context_specific) throws IOException { - PrintWriter writer = env.getFiler().createSourceFile("org.lwjgl.opengl." + Utils.CONTEXT_CAPS_CLASS_NAME); + PrintWriter writer = env.getFiler().createTextFile(Filer.Location.SOURCE_TREE, "org.lwjgl.opengl", new File(Utils.CONTEXT_CAPS_CLASS_NAME + ".java"), null); writer.println("/* MACHINE GENERATED FILE, DO NOT EDIT */"); writer.println(); writer.println("package org.lwjgl.opengl;"); diff --git a/src/java/org/lwjgl/util/generator/GeneratorVisitor.java b/src/java/org/lwjgl/util/generator/GeneratorVisitor.java index 11d913d4..28e98aa5 100644 --- a/src/java/org/lwjgl/util/generator/GeneratorVisitor.java +++ b/src/java/org/lwjgl/util/generator/GeneratorVisitor.java @@ -164,7 +164,8 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { private void generateJavaSource(InterfaceDeclaration d) throws IOException { validateMethods(d); - PrintWriter java_writer = env.getFiler().createSourceFile(Utils.getQualifiedClassName(d)); +// PrintWriter java_writer = env.getFiler().createSourceFile(Utils.getQualifiedClassName(d)); + PrintWriter java_writer = env.getFiler().createTextFile(Filer.Location.SOURCE_TREE, d.getPackage().getQualifiedName(), new File(Utils.getSimpleClassName(d) + ".java"), null); java_writer.println("/* MACHINE GENERATED FILE, DO NOT EDIT */"); java_writer.println(); java_writer.println("package " + d.getPackage().getQualifiedName() + ";"); diff --git a/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java b/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java index 4034fb49..d6fafbb2 100644 --- a/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java +++ b/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java @@ -144,7 +144,7 @@ public class ReferencesGeneratorProcessorFactory implements AnnotationProcessorF } private void generateReferencesSource() throws IOException { - PrintWriter writer = env.getFiler().createSourceFile("org.lwjgl.opengl." + REFERENCES_CLASS_NAME); + PrintWriter writer = env.getFiler().createTextFile(Filer.Location.SOURCE_TREE, "org.lwjgl.opengl", new File(REFERENCES_CLASS_NAME + ".java"), null); writer.println("/* MACHINE GENERATED FILE, DO NOT EDIT */"); writer.println(); writer.println("package org.lwjgl.opengl;"); diff --git a/src/native/common/org_lwjgl_openal_AL10.c b/src/native/generated/org_lwjgl_openal_AL10.c similarity index 100% rename from src/native/common/org_lwjgl_openal_AL10.c rename to src/native/generated/org_lwjgl_openal_AL10.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c b/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c rename to src/native/generated/org_lwjgl_opengl_ARBBufferObject.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c b/src/native/generated/org_lwjgl_opengl_ARBColorBufferFloat.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c rename to src/native/generated/org_lwjgl_opengl_ARBColorBufferFloat.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBDrawBuffers.c b/src/native/generated/org_lwjgl_opengl_ARBDrawBuffers.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBDrawBuffers.c rename to src/native/generated/org_lwjgl_opengl_ARBDrawBuffers.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBImaging.c b/src/native/generated/org_lwjgl_opengl_ARBImaging.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBImaging.c rename to src/native/generated/org_lwjgl_opengl_ARBImaging.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c b/src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c rename to src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.c b/src/native/generated/org_lwjgl_opengl_ARBMultisample.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBMultisample.c rename to src/native/generated/org_lwjgl_opengl_ARBMultisample.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.c b/src/native/generated/org_lwjgl_opengl_ARBMultitexture.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.c rename to src/native/generated/org_lwjgl_opengl_ARBMultitexture.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c b/src/native/generated/org_lwjgl_opengl_ARBOcclusionQuery.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c rename to src/native/generated/org_lwjgl_opengl_ARBOcclusionQuery.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.c b/src/native/generated/org_lwjgl_opengl_ARBPointParameters.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.c rename to src/native/generated/org_lwjgl_opengl_ARBPointParameters.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBProgram.c b/src/native/generated/org_lwjgl_opengl_ARBProgram.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBProgram.c rename to src/native/generated/org_lwjgl_opengl_ARBProgram.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c b/src/native/generated/org_lwjgl_opengl_ARBShaderObjects.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c rename to src/native/generated/org_lwjgl_opengl_ARBShaderObjects.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c b/src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c rename to src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c b/src/native/generated/org_lwjgl_opengl_ARBTransposeMatrix.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c rename to src/native/generated/org_lwjgl_opengl_ARBTransposeMatrix.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c b/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c rename to src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c b/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c rename to src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.c b/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.c rename to src/native/generated/org_lwjgl_opengl_ARBVertexShader.c diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.c b/src/native/generated/org_lwjgl_opengl_ARBWindowPos.c similarity index 100% rename from src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.c rename to src/native/generated/org_lwjgl_opengl_ARBWindowPos.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.c b/src/native/generated/org_lwjgl_opengl_ATIDrawBuffers.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.c rename to src/native/generated/org_lwjgl_opengl_ATIDrawBuffers.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.c b/src/native/generated/org_lwjgl_opengl_ATIElementArray.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIElementArray.c rename to src/native/generated/org_lwjgl_opengl_ATIElementArray.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c b/src/native/generated/org_lwjgl_opengl_ATIEnvmapBumpmap.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c rename to src/native/generated/org_lwjgl_opengl_ATIEnvmapBumpmap.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c b/src/native/generated/org_lwjgl_opengl_ATIFragmentShader.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c rename to src/native/generated/org_lwjgl_opengl_ATIFragmentShader.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c b/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c rename to src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c b/src/native/generated/org_lwjgl_opengl_ATIPnTriangles.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c rename to src/native/generated/org_lwjgl_opengl_ATIPnTriangles.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c b/src/native/generated/org_lwjgl_opengl_ATISeparateStencil.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c rename to src/native/generated/org_lwjgl_opengl_ATISeparateStencil.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c b/src/native/generated/org_lwjgl_opengl_ATIVertexArrayObject.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c rename to src/native/generated/org_lwjgl_opengl_ATIVertexArrayObject.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c b/src/native/generated/org_lwjgl_opengl_ATIVertexAttribArrayObject.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c rename to src/native/generated/org_lwjgl_opengl_ATIVertexAttribArrayObject.c diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c b/src/native/generated/org_lwjgl_opengl_ATIVertexStreams.c similarity index 100% rename from src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c rename to src/native/generated/org_lwjgl_opengl_ATIVertexStreams.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.c b/src/native/generated/org_lwjgl_opengl_EXTBlendEquationSeparate.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.c rename to src/native/generated/org_lwjgl_opengl_EXTBlendEquationSeparate.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.c b/src/native/generated/org_lwjgl_opengl_EXTBlendFuncSeparate.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.c rename to src/native/generated/org_lwjgl_opengl_EXTBlendFuncSeparate.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c b/src/native/generated/org_lwjgl_opengl_EXTCompiledVertexArray.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c rename to src/native/generated/org_lwjgl_opengl_EXTCompiledVertexArray.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTDepthBoundsTest.c b/src/native/generated/org_lwjgl_opengl_EXTDepthBoundsTest.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTDepthBoundsTest.c rename to src/native/generated/org_lwjgl_opengl_EXTDepthBoundsTest.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.c b/src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.c rename to src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.c b/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.c rename to src/native/generated/org_lwjgl_opengl_EXTFogCoord.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c b/src/native/generated/org_lwjgl_opengl_EXTFramebufferObject.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c rename to src/native/generated/org_lwjgl_opengl_EXTFramebufferObject.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.c b/src/native/generated/org_lwjgl_opengl_EXTMultiDrawArrays.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.c rename to src/native/generated/org_lwjgl_opengl_EXTMultiDrawArrays.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c b/src/native/generated/org_lwjgl_opengl_EXTPalettedTexture.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c rename to src/native/generated/org_lwjgl_opengl_EXTPalettedTexture.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.c b/src/native/generated/org_lwjgl_opengl_EXTPointParameters.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.c rename to src/native/generated/org_lwjgl_opengl_EXTPointParameters.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c b/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c rename to src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c diff --git a/src/native/generated/org_lwjgl_opengl_EXTStencilClearTag.c b/src/native/generated/org_lwjgl_opengl_EXTStencilClearTag.c new file mode 100644 index 00000000..78ea9c8d --- /dev/null +++ b/src/native/generated/org_lwjgl_opengl_EXTStencilClearTag.c @@ -0,0 +1,12 @@ +/* MACHINE GENERATED FILE, DO NOT EDIT */ + +#include +#include "extgl.h" + +typedef void (APIENTRY *glStencilClearTagEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag); + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTStencilClearTag_nglStencilClearTagEXT(JNIEnv *env, jclass clazz, jint stencilTagBits, jint stencilClearTag, jlong function_pointer) { + glStencilClearTagEXTPROC glStencilClearTagEXT = (glStencilClearTagEXTPROC)((intptr_t)function_pointer); + glStencilClearTagEXT(stencilTagBits, stencilClearTag); +} + diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.c b/src/native/generated/org_lwjgl_opengl_EXTStencilTwoSide.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.c rename to src/native/generated/org_lwjgl_opengl_EXTStencilTwoSide.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.c b/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.c rename to src/native/generated/org_lwjgl_opengl_EXTVertexShader.c diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c b/src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c similarity index 100% rename from src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c rename to src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c diff --git a/src/native/common/org_lwjgl_opengl_GL11.c b/src/native/generated/org_lwjgl_opengl_GL11.c similarity index 100% rename from src/native/common/org_lwjgl_opengl_GL11.c rename to src/native/generated/org_lwjgl_opengl_GL11.c diff --git a/src/native/common/org_lwjgl_opengl_GL12.c b/src/native/generated/org_lwjgl_opengl_GL12.c similarity index 100% rename from src/native/common/org_lwjgl_opengl_GL12.c rename to src/native/generated/org_lwjgl_opengl_GL12.c diff --git a/src/native/common/org_lwjgl_opengl_GL13.c b/src/native/generated/org_lwjgl_opengl_GL13.c similarity index 100% rename from src/native/common/org_lwjgl_opengl_GL13.c rename to src/native/generated/org_lwjgl_opengl_GL13.c diff --git a/src/native/common/org_lwjgl_opengl_GL14.c b/src/native/generated/org_lwjgl_opengl_GL14.c similarity index 100% rename from src/native/common/org_lwjgl_opengl_GL14.c rename to src/native/generated/org_lwjgl_opengl_GL14.c diff --git a/src/native/common/org_lwjgl_opengl_GL15.c b/src/native/generated/org_lwjgl_opengl_GL15.c similarity index 100% rename from src/native/common/org_lwjgl_opengl_GL15.c rename to src/native/generated/org_lwjgl_opengl_GL15.c diff --git a/src/native/common/org_lwjgl_opengl_GL20.c b/src/native/generated/org_lwjgl_opengl_GL20.c similarity index 100% rename from src/native/common/org_lwjgl_opengl_GL20.c rename to src/native/generated/org_lwjgl_opengl_GL20.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.c b/src/native/generated/org_lwjgl_opengl_NVEvaluators.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVEvaluators.c rename to src/native/generated/org_lwjgl_opengl_NVEvaluators.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVFence.c b/src/native/generated/org_lwjgl_opengl_NVFence.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVFence.c rename to src/native/generated/org_lwjgl_opengl_NVFence.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c b/src/native/generated/org_lwjgl_opengl_NVFragmentProgram.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c rename to src/native/generated/org_lwjgl_opengl_NVFragmentProgram.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.c b/src/native/generated/org_lwjgl_opengl_NVHalfFloat.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.c rename to src/native/generated/org_lwjgl_opengl_NVHalfFloat.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c b/src/native/generated/org_lwjgl_opengl_NVOcclusionQuery.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c rename to src/native/generated/org_lwjgl_opengl_NVOcclusionQuery.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c b/src/native/generated/org_lwjgl_opengl_NVPixelDataRange.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c rename to src/native/generated/org_lwjgl_opengl_NVPixelDataRange.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.c b/src/native/generated/org_lwjgl_opengl_NVPointSprite.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVPointSprite.c rename to src/native/generated/org_lwjgl_opengl_NVPointSprite.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c b/src/native/generated/org_lwjgl_opengl_NVPrimitiveRestart.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c rename to src/native/generated/org_lwjgl_opengl_NVPrimitiveRestart.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVProgram.c b/src/native/generated/org_lwjgl_opengl_NVProgram.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVProgram.c rename to src/native/generated/org_lwjgl_opengl_NVProgram.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c b/src/native/generated/org_lwjgl_opengl_NVRegisterCombiners.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c rename to src/native/generated/org_lwjgl_opengl_NVRegisterCombiners.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c b/src/native/generated/org_lwjgl_opengl_NVRegisterCombiners2.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c rename to src/native/generated/org_lwjgl_opengl_NVRegisterCombiners2.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c b/src/native/generated/org_lwjgl_opengl_NVVertexArrayRange.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c rename to src/native/generated/org_lwjgl_opengl_NVVertexArrayRange.c diff --git a/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.c b/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c similarity index 100% rename from src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.c rename to src/native/generated/org_lwjgl_opengl_NVVertexProgram.c diff --git a/src/native/linux/Makefile b/src/native/linux/Makefile index 352b7963..68bc54e2 100644 --- a/src/native/linux/Makefile +++ b/src/native/linux/Makefile @@ -6,7 +6,7 @@ STRIP=strip CFLAGS_LINK=-shared -Wall LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../common/arb/*.c) $(wildcard ../common/ati/*.c) $(wildcard ../common/ext/*.c) $(wildcard ../common/nv/*.c) +SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c) OBJECTS=$(subst .c,.o,$(SRC)) LIBRARY=liblwjgl.so diff --git a/src/native/macosx/Makefile b/src/native/macosx/Makefile index 8139cec8..7c686f97 100644 --- a/src/native/macosx/Makefile +++ b/src/native/macosx/Makefile @@ -4,7 +4,7 @@ STRIP=strip CFLAGS_LINK=-dynamiclib -Wall FRAMEWORKS=-framework Foundation -framework AppKit -framework JavaVM -framework Carbon CFLAGS_O=-fPIC -O2 -D_MACOSX -Wall -c -I${AL}/include -I../common -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -SRC=$(wildcard *.m) $(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../common/arb/*.c) $(wildcard ../common/ati/*.c) $(wildcard ../common/ext/*.c) $(wildcard ../common/nv/*.c) +SRC=$(wildcard *.m) $(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*.c) OBJECTS=$(subst .m,.o, $(subst .c,.o,$(SRC))) LIBRARY=liblwjgl.jnilib