From: <sp...@us...> - 2012-09-03 19:47:12
|
Revision: 3793 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3793&view=rev Author: spasi Date: 2012-09-03 19:47:05 +0000 (Mon, 03 Sep 2012) Log Message: ----------- Removed some re-defined GL11 enums. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -47,9 +47,7 @@ * Returned as a valid value in <data> parameter of * GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD */ - int GL_UNSIGNED_INT = 0x1405, - GL_FLOAT = 0x1406, - GL_UNSIGNED_INT64_AMD = 0x8BC2, + int GL_UNSIGNED_INT64_AMD = 0x8BC2, GL_PERCENTAGE_AMD = 0x8BC3; /** Accepted by the <pname> parameter of GetPerfMonitorCounterDataAMD */ Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -61,11 +61,9 @@ int GL_SHADER_OBJECT_ARB = 0x8B48; /** Returned by the <type> parameter of GetActiveUniformARB: */ - int GL_FLOAT = 0x1406; int GL_FLOAT_VEC2_ARB = 0x8B50; int GL_FLOAT_VEC3_ARB = 0x8B51; int GL_FLOAT_VEC4_ARB = 0x8B52; - int GL_INT = 0x1404; int GL_INT_VEC2_ARB = 0x8B53; int GL_INT_VEC3_ARB = 0x8B54; int GL_INT_VEC4_ARB = 0x8B55; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -71,10 +71,4 @@ int GL_RG = 0x8227; int GL_RG_INTEGER = 0x8228; - /** - * Accepted by the <param> parameter of the TexParameter{if}* - * functions when <pname> is DEPTH_TEXTURE_MODE: - */ - int GL_RED = 0x1903; - } \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -81,7 +81,6 @@ int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; /** Returned by the <type> parameter of GetActiveAttribARB: */ - int GL_FLOAT = 0x1406; int GL_FLOAT_VEC2_ARB = 0x8B50; int GL_FLOAT_VEC3_ARB = 0x8B51; int GL_FLOAT_VEC4_ARB = 0x8B52; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -57,7 +57,6 @@ int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3; int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4; int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5; - int GL_UNSIGNED_INT = 0x1405; int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6; int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7; int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/AMD_performance_monitor.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -47,8 +47,6 @@ * Returned as a valid value in <data> parameter of * GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD */ - int GL_UNSIGNED_INT = 0x1405; - int GL_FLOAT = 0x1406; int GL_UNSIGNED_INT64_AMD = 0x8BC2; int GL_PERCENTAGE_AMD = 0x8BC3; Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java 2012-08-28 09:06:36 UTC (rev 3792) +++ trunk/LWJGL/src/templates/org/lwjgl/opengles/OES_texture_float.java 2012-09-03 19:47:05 UTC (rev 3793) @@ -32,11 +32,4 @@ package org.lwjgl.opengles; public interface OES_texture_float { - - /** - * Accepted by the <type> parameter of TexImage2D, TexSubImage2D, - * TexImage3D, and TexSubImage3D: - */ - int GL_FLOAT = 0x1406; - } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |