diff --git a/unpick-definitions/opengl.unpick b/unpick-definitions/opengl.unpick index dbb114618..964eb3b48 100644 --- a/unpick-definitions/opengl.unpick +++ b/unpick-definitions/opengl.unpick @@ -13,70 +13,81 @@ constant gl_blend_factor org/lwjgl/opengl/GL11 GL_DST_COLOR constant gl_blend_factor org/lwjgl/opengl/GL11 GL_ONE_MINUS_DST_COLOR constant gl_blend_factor org/lwjgl/opengl/GL11 GL_SRC_ALPHA_SATURATE -constant gl_state org/lwjgl/opengl/GL11 GL_NEVER -constant gl_state org/lwjgl/opengl/GL11 GL_LESS -constant gl_state org/lwjgl/opengl/GL11 GL_EQUAL -constant gl_state org/lwjgl/opengl/GL11 GL_LEQUAL -constant gl_state org/lwjgl/opengl/GL11 GL_GREATER -constant gl_state org/lwjgl/opengl/GL11 GL_NOTEQUAL -constant gl_state org/lwjgl/opengl/GL11 GL_GEQUAL -constant gl_state org/lwjgl/opengl/GL11 GL_ALWAYS - -constant gl_state org/lwjgl/opengl/GL11 GL_FRONT_LEFT -constant gl_state org/lwjgl/opengl/GL11 GL_FRONT_RIGHT -constant gl_state org/lwjgl/opengl/GL11 GL_BACK_LEFT -constant gl_state org/lwjgl/opengl/GL11 GL_BACK_RIGHT -constant gl_state org/lwjgl/opengl/GL11 GL_FRONT -constant gl_state org/lwjgl/opengl/GL11 GL_BACK -constant gl_state org/lwjgl/opengl/GL11 GL_LEFT -constant gl_state org/lwjgl/opengl/GL11 GL_RIGHT -constant gl_state org/lwjgl/opengl/GL11 GL_FRONT_AND_BACK -constant gl_state org/lwjgl/opengl/GL11 GL_AUX0 -constant gl_state org/lwjgl/opengl/GL11 GL_AUX1 -constant gl_state org/lwjgl/opengl/GL11 GL_AUX2 -constant gl_state org/lwjgl/opengl/GL11 GL_AUX3 - -constant gl_state org/lwjgl/opengl/GL11 GL_FLAT -constant gl_state org/lwjgl/opengl/GL11 GL_SMOOTH - -constant gl_state org/lwjgl/opengl/GL11 GL_MODELVIEW -constant gl_state org/lwjgl/opengl/GL11 GL_PROJECTION -constant gl_state org/lwjgl/opengl/GL11 GL_TEXTURE - -constant gl_state org/lwjgl/opengl/GL11 GL_COLOR -constant gl_state org/lwjgl/opengl/GL11 GL_DEPTH -constant gl_state org/lwjgl/opengl/GL11 GL_STENCIL - -constant gl_state org/lwjgl/opengl/GL11 GL_FOG -constant gl_state org/lwjgl/opengl/GL11 GL_DEPTH_TEST -constant gl_state org/lwjgl/opengl/GL11 GL_ALPHA_TEST -constant gl_state org/lwjgl/opengl/GL11 GL_BLEND - -constant gl_state org/lwjgl/opengl/GL11 GL_TEXTURE_1D -constant gl_state org/lwjgl/opengl/GL11 GL_TEXTURE_2D -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHTING -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT0 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT1 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT2 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT3 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT4 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT5 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT6 -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT7 -constant gl_state org/lwjgl/opengl/GL11 GL_POSITION -constant gl_state org/lwjgl/opengl/GL11 GL_DIFFUSE -constant gl_state org/lwjgl/opengl/GL11 GL_AMBIENT -constant gl_state org/lwjgl/opengl/GL11 GL_SPECULAR -constant gl_state org/lwjgl/opengl/GL11 GL_LIGHT_MODEL_AMBIENT -constant gl_state org/lwjgl/opengl/GL11 GL_AMBIENT_AND_DIFFUSE -# constant gl_state org/lwjgl/opengl/GL11 GL_COLOR_BUFFER_BIT -constant gl_state org/lwjgl/opengl/GL11 GL_DEPTH_BUFFER_BIT -constant gl_state org/lwjgl/opengl/GL11 GL_CULL_FACE -constant gl_state org/lwjgl/opengl/GL11 GL_POLYGON_OFFSET_LINE -constant gl_state org/lwjgl/opengl/GL11 GL_POLYGON_OFFSET_FILL -constant gl_state org/lwjgl/opengl/GL11 GL_COLOR_LOGIC_OP -constant gl_state org/lwjgl/opengl/GL11 GL_SCISSOR_TEST -constant gl_state org/lwjgl/opengl/GL11 GL_COLOR_MATERIAL +constant gl_int org/lwjgl/opengl/GL11 GL_NEVER +constant gl_int org/lwjgl/opengl/GL11 GL_LESS +constant gl_int org/lwjgl/opengl/GL11 GL_EQUAL +constant gl_int org/lwjgl/opengl/GL11 GL_LEQUAL +constant gl_int org/lwjgl/opengl/GL11 GL_GREATER +constant gl_int org/lwjgl/opengl/GL11 GL_NOTEQUAL +constant gl_int org/lwjgl/opengl/GL11 GL_GEQUAL +constant gl_int org/lwjgl/opengl/GL11 GL_ALWAYS + +constant gl_int org/lwjgl/opengl/GL11 GL_FRONT_LEFT +constant gl_int org/lwjgl/opengl/GL11 GL_FRONT_RIGHT +constant gl_int org/lwjgl/opengl/GL11 GL_BACK_LEFT +constant gl_int org/lwjgl/opengl/GL11 GL_BACK_RIGHT +constant gl_int org/lwjgl/opengl/GL11 GL_FRONT +constant gl_int org/lwjgl/opengl/GL11 GL_BACK +constant gl_int org/lwjgl/opengl/GL11 GL_LEFT +constant gl_int org/lwjgl/opengl/GL11 GL_RIGHT +constant gl_int org/lwjgl/opengl/GL11 GL_FRONT_AND_BACK +constant gl_int org/lwjgl/opengl/GL11 GL_AUX0 +constant gl_int org/lwjgl/opengl/GL11 GL_AUX1 +constant gl_int org/lwjgl/opengl/GL11 GL_AUX2 +constant gl_int org/lwjgl/opengl/GL11 GL_AUX3 + +constant gl_int org/lwjgl/opengl/GL11 GL_FLAT +constant gl_int org/lwjgl/opengl/GL11 GL_SMOOTH + +constant gl_int org/lwjgl/opengl/GL11 GL_MODELVIEW +constant gl_int org/lwjgl/opengl/GL11 GL_PROJECTION +constant gl_int org/lwjgl/opengl/GL11 GL_TEXTURE + +constant gl_int org/lwjgl/opengl/GL11 GL_COLOR +constant gl_int org/lwjgl/opengl/GL11 GL_DEPTH +constant gl_int org/lwjgl/opengl/GL11 GL_STENCIL + +constant gl_int org/lwjgl/opengl/GL11 GL_FOG +constant gl_int org/lwjgl/opengl/GL11 GL_FOG_DENSITY +constant gl_int org/lwjgl/opengl/GL11 GL_FOG_START +constant gl_int org/lwjgl/opengl/GL11 GL_FOG_END +constant gl_int org/lwjgl/opengl/GL11 GL_FOG_MODE +constant gl_int org/lwjgl/opengl/GL11 GL_FOG_COLOR +constant gl_int org/lwjgl/opengl/NVFogDistance GL_FOG_DISTANCE_MODE_NV +constant gl_int org/lwjgl/opengl/GL11 GL_EXP +constant gl_int org/lwjgl/opengl/GL11 GL_EXP2 +constant gl_int org/lwjgl/opengl/GL11 GL_LINEAR + +constant gl_int org/lwjgl/opengl/GL11 GL_DEPTH_TEST +constant gl_int org/lwjgl/opengl/GL11 GL_ALPHA_TEST +constant gl_int org/lwjgl/opengl/GL11 GL_BLEND + +constant gl_int org/lwjgl/opengl/GL11 GL_TEXTURE_1D +constant gl_int org/lwjgl/opengl/GL11 GL_TEXTURE_2D +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHTING +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT0 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT1 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT2 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT3 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT4 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT5 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT6 +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT7 +constant gl_int org/lwjgl/opengl/GL11 GL_POSITION +constant gl_int org/lwjgl/opengl/GL11 GL_DIFFUSE +constant gl_int org/lwjgl/opengl/GL11 GL_AMBIENT +constant gl_int org/lwjgl/opengl/GL11 GL_SPECULAR +constant gl_int org/lwjgl/opengl/GL11 GL_LIGHT_MODEL_AMBIENT +constant gl_int org/lwjgl/opengl/GL11 GL_AMBIENT_AND_DIFFUSE +constant gl_int org/lwjgl/opengl/GL11 GL_CULL_FACE +constant gl_int org/lwjgl/opengl/GL11 GL_POLYGON_OFFSET_LINE +constant gl_int org/lwjgl/opengl/GL11 GL_POLYGON_OFFSET_FILL +constant gl_int org/lwjgl/opengl/GL11 GL_COLOR_LOGIC_OP +constant gl_int org/lwjgl/opengl/GL11 GL_SCISSOR_TEST +constant gl_int org/lwjgl/opengl/GL11 GL_COLOR_MATERIAL + +flag gl_attrib_flag org/lwjgl/opengl/GL11 GL_DEPTH_BUFFER_BIT +flag gl_attrib_flag org/lwjgl/opengl/GL11 GL_COLOR_BUFFER_BIT constant gl_logic_op org/lwjgl/opengl/GL11 GL_CLEAR constant gl_logic_op org/lwjgl/opengl/GL11 GL_AND @@ -128,56 +139,64 @@ constant gl_occlusion_query_target org/lwjgl/opengl/ARBOcclusionQuery GL_SAMPLES constant gl_occlusion_query_parameter org/lwjgl/opengl/ARBOcclusionQuery GL_QUERY_RESULT_ARB constant gl_occlusion_query_parameter org/lwjgl/opengl/ARBOcclusionQuery GL_QUERY_RESULT_AVAILABLE_ARB -target_method org/lwjgl/opengl/GL11 glBlendFunc (II)V - param 0 gl_blend_factor - param 1 gl_blend_factor +constant gl_string org/lwjgl/opengl/GL11 GL_VENDOR +constant gl_string org/lwjgl/opengl/GL11 GL_RENDERER +constant gl_string org/lwjgl/opengl/GL11 GL_VERSION +constant gl_string org/lwjgl/opengl/GL11 GL_EXTENSIONS -target_method net/minecraft/client/render/platform/GLX blendFuncSeparate (IIII)V +target_method org/lwjgl/opengl/GL11 glBlendFunc (II)V param 0 gl_blend_factor param 1 gl_blend_factor - param 2 gl_blend_factor - param 3 gl_blend_factor target_method org/lwjgl/opengl/GL11 glMatrixMode (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glEnable (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glDisable (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glBindTexture (II)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glDepthFunc (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glAlphaFunc (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glAlphaFunc (IF)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glCullFace (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glClear (I)V - param 0 gl_state + param 0 gl_attrib_flag target_method org/lwjgl/opengl/GL11 glShadeModel (I)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glLightModel (ILjava/nio/FloatBuffer;)V - param 0 gl_state + param 0 gl_int target_method org/lwjgl/opengl/GL11 glLight (IILjava/nio/FloatBuffer;)V - param 0 gl_state - param 1 gl_state + param 0 gl_int + param 1 gl_int target_method org/lwjgl/opengl/GL11 glColorMaterial (II)V - param 0 gl_state - param 1 gl_state + param 0 gl_int + param 1 gl_int + +target_method org/lwjgl/opengl/GL11 glFogf (IF)V + param 0 gl_int + +target_method org/lwjgl/opengl/GL11 glFogi (II)V + param 0 gl_int + +target_method org/lwjgl/opengl/GL11 glFog (ILjava/nio/FloatBuffer;)V + param 0 gl_int target_method org/lwjgl/opengl/GL11 glLogicOp (I)V param 0 gl_logic_op @@ -210,6 +229,9 @@ target_method org/lwjgl/opengl/GL11 glTexSubImage2D (IIIIIIIILjava/nio/IntBuffer target_method org/lwjgl/opengl/GL11 glNewList (II)V param 1 gl_list_mode +target_method org/lwjgl/opengl/GL11 glGetString (I)Ljava/lang/String; + param 0 gl_string + target_method org/lwjgl/opengl/ARBOcclusionQuery glBeginQueryARB (II)V param 0 gl_occlusion_query_target @@ -219,6 +241,12 @@ target_method org/lwjgl/opengl/ARBOcclusionQuery glEndQueryARB (I)V target_method org/lwjgl/opengl/ARBOcclusionQuery glGetQueryObjectuARB (IILjava/nio/IntBuffer;)V param 1 gl_occlusion_query_parameter +target_method net/minecraft/client/render/platform/GLX blendFuncSeparate (IIII)V + param 0 gl_blend_factor + param 1 gl_blend_factor + param 2 gl_blend_factor + param 3 gl_blend_factor + ### 14w26a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager blendFunc (II)V param 0 gl_blend_factor @@ -233,24 +261,32 @@ target_method net/minecraft/client/render/platform/GlStateManager blendFuncSepar ### 14w26a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager depthFunc (I)V - param 0 gl_state + param 0 gl_int ### 14w26a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager alphaFunc (IF)V - param 0 gl_state + param 0 gl_int + +### 14w26a .. 18w43b +target_method net/minecraft/client/render/platform/GlStateManager fogMode (I)V + param 0 gl_int ### 14w26a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager cullFace (I)V - param 0 gl_state + param 0 gl_int ### 14w26a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager shadeModel (I)V - param 0 gl_state + param 0 gl_int ### 14w26a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager colorMaterial (II)V - param 0 gl_state - param 1 gl_state + param 0 gl_int + param 1 gl_int + +### 14w28a .. 18w43b +target_method net/minecraft/client/render/platform/GlStateManager clear (I)V + param 0 gl_attrib_flag ### 14w28a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager logicOp (I)V @@ -258,16 +294,16 @@ target_method net/minecraft/client/render/platform/GlStateManager logicOp (I)V ### 14w28a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager matrixMode (I)V - param 0 gl_state + param 0 gl_int ### 15w51a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager lightModel (ILjava/nio/FloatBuffer;)V - param 0 gl_state + param 0 gl_int ### 15w51a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager light (IILjava/nio/FloatBuffer;)V - param 0 gl_state - param 1 gl_state + param 0 gl_int + param 1 gl_int ### 15w51a .. 18w43b target_method net/minecraft/client/render/platform/GlStateManager texParameter (III)V @@ -281,3 +317,7 @@ target_method net/minecraft/client/render/platform/GlStateManager texParameter ( param 1 gl_tex_param param 2 gl_tex_value +### 15w51a .. 18w43b +target_method net/minecraft/client/render/platform/GlStateManager getString (I)Ljava/lang/String; + param 0 gl_string +