Skip to content

Start unpicks for 26.2-snapshot-1 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ishland merged 6 commits into from
Apr 9, 2026
Merged

Start unpicks for 26.2-snapshot-1 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76a83a4
change: migrate blaze3d GpuBuffer$Usage to target_annotation
ishland Apr 9, 2026
11f918c
fix: formatting
ishland Apr 9, 2026
f10c0cc
new: finish most of GlConst unpick
ishland Apr 9, 2026
6ed293b
new: unpick more GlConst
ishland Apr 9, 2026
2cfdd05
new: finish GlStateManager
ishland Apr 9, 2026
ddce8f3
new: finish most OpenGL
ishland Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions unpick-definitions/blaze3d.unpick
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
unpick v4

group int blaze3d_gpu_buffer_flags
@flags
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_MAP_READ
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_MAP_WRITE
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_HINT_CLIENT_STORAGE
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_COPY_DST
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_COPY_SRC
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_VERTEX
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_INDEX
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_UNIFORM
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_UNIFORM_TEXEL_BUFFER

group int blaze3d_color_target_state_write_mask
@flags
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_RGB
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_ALL
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_NONE
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_RED
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_GREEN
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_BLUE
com.mojang.blaze3d.pipeline.ColorTargetState.WRITE_ALPHA

target_annotation com.mojang.blaze3d.buffers.GpuBuffer$Usage blaze3d_gpu_buffer_flags

target_annotation com.mojang.blaze3d.pipeline.ColorTargetState$WriteMask blaze3d_color_target_state_write_mask
177 changes: 144 additions & 33 deletions unpick-definitions/gl.unpick
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ group int gl_depth_test_function
com.mojang.blaze3d.opengl.GlConst.GL_GREATER
com.mojang.blaze3d.opengl.GlConst.GL_GEQUAL
com.mojang.blaze3d.opengl.GlConst.GL_ALWAYS
org.lwjgl.opengl.GL11.GL_NEVER
org.lwjgl.opengl.GL11.GL_NOTEQUAL

group int gl_polygon_mode
com.mojang.blaze3d.opengl.GlConst.GL_LINE
Expand All @@ -35,6 +37,7 @@ group int gl_draw_mode
com.mojang.blaze3d.opengl.GlConst.GL_TRIANGLE_STRIP
com.mojang.blaze3d.opengl.GlConst.GL_TRIANGLE_FAN
com.mojang.blaze3d.opengl.GlConst.GL_TRIANGLES
org.lwjgl.opengl.GL11.GL_POINTS

group int gl_address_mode
com.mojang.blaze3d.opengl.GlConst.GL_CLAMP_TO_EDGE
Expand All @@ -54,6 +57,7 @@ group int gl_filter
group int gl_tex_target
com.mojang.blaze3d.opengl.GlConst.GL_TEXTURE_2D
com.mojang.blaze3d.opengl.GlConst.GL_PROXY_TEXTURE_2D
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP

group int gl_tex_parameter_pname
com.mojang.blaze3d.opengl.GlConst.GL_TEXTURE_MAG_FILTER
Expand All @@ -62,6 +66,7 @@ group int gl_tex_parameter_pname
com.mojang.blaze3d.opengl.GlConst.GL_TEXTURE_WRAP_S
com.mojang.blaze3d.opengl.GlConst.GL_TEXTURE_WRAP_T
org.lwjgl.opengl.GL12.GL_TEXTURE_MAX_LEVEL
org.lwjgl.opengl.GL12.GL_TEXTURE_BASE_LEVEL
org.lwjgl.opengl.GL12.GL_TEXTURE_MAX_LOD
org.lwjgl.opengl.GL12.GL_TEXTURE_MIN_LOD
org.lwjgl.opengl.GL14.GL_TEXTURE_LOD_BIAS
Expand All @@ -86,8 +91,70 @@ group int gl_tex_format
com.mojang.blaze3d.opengl.GlConst.GL_R8
com.mojang.blaze3d.opengl.GlConst.GL_RGB
com.mojang.blaze3d.opengl.GlConst.GL_RED
org.lwjgl.opengl.GL11.GL_RGBA16
org.lwjgl.opengl.GL11.GL_RGB10_A2
org.lwjgl.opengl.GL11.GL_STENCIL_INDEX
org.lwjgl.opengl.GL12.GL_BGRA
org.lwjgl.opengl.GL14.GL_DEPTH_COMPONENT16
org.lwjgl.opengl.GL14.GL_DEPTH_COMPONENT24
org.lwjgl.opengl.GL30.GL_RGB_INTEGER
org.lwjgl.opengl.GL30.GL_RGBA_INTEGER
org.lwjgl.opengl.GL30.GL_RED_INTEGER
org.lwjgl.opengl.GL30.GL_RG_INTEGER
org.lwjgl.opengl.GL30.GL_R16
org.lwjgl.opengl.GL30.GL_RG8
org.lwjgl.opengl.GL30.GL_RG16
org.lwjgl.opengl.GL30.GL_R16F
org.lwjgl.opengl.GL30.GL_R32F
org.lwjgl.opengl.GL30.GL_RG16F
org.lwjgl.opengl.GL30.GL_RG32F
org.lwjgl.opengl.GL30.GL_R8I
org.lwjgl.opengl.GL30.GL_R8UI
org.lwjgl.opengl.GL30.GL_R16I
org.lwjgl.opengl.GL30.GL_R16UI
org.lwjgl.opengl.GL30.GL_R32I
org.lwjgl.opengl.GL30.GL_R32UI
org.lwjgl.opengl.GL30.GL_RG8I
org.lwjgl.opengl.GL30.GL_RG8UI
org.lwjgl.opengl.GL30.GL_RG16I
org.lwjgl.opengl.GL30.GL_RG16UI
org.lwjgl.opengl.GL30.GL_RG32I
org.lwjgl.opengl.GL30.GL_RG32UI
org.lwjgl.opengl.GL30.GL_COMPRESSED_RED
org.lwjgl.opengl.GL30.GL_COMPRESSED_RG
org.lwjgl.opengl.GL30.GL_RGBA32UI
org.lwjgl.opengl.GL30.GL_RGB32UI
org.lwjgl.opengl.GL30.GL_RGBA16UI
org.lwjgl.opengl.GL30.GL_RGB16UI
org.lwjgl.opengl.GL30.GL_RGBA8UI
org.lwjgl.opengl.GL30.GL_RGB8UI
org.lwjgl.opengl.GL30.GL_RGBA32I
org.lwjgl.opengl.GL30.GL_RGB32I
org.lwjgl.opengl.GL30.GL_RGBA16I
org.lwjgl.opengl.GL30.GL_RGB16I
org.lwjgl.opengl.GL30.GL_RGBA8I
org.lwjgl.opengl.GL30.GL_RGB8I
org.lwjgl.opengl.GL30.GL_RGBA32F
org.lwjgl.opengl.GL30.GL_RGB32F
org.lwjgl.opengl.GL30.GL_RGBA16F
org.lwjgl.opengl.GL30.GL_RGB16F
org.lwjgl.opengl.GL30.GL_R11F_G11F_B10F
org.lwjgl.opengl.GL30.GL_STENCIL_INDEX1
org.lwjgl.opengl.GL30.GL_STENCIL_INDEX4
org.lwjgl.opengl.GL30.GL_STENCIL_INDEX8
org.lwjgl.opengl.GL30.GL_STENCIL_INDEX16
org.lwjgl.opengl.GL30.GL_DEPTH_COMPONENT32F
org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8
org.lwjgl.opengl.GL30.GL_DEPTH24_STENCIL8
org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL
org.lwjgl.opengl.GL31.GL_R8_SNORM
org.lwjgl.opengl.GL31.GL_RG8_SNORM
org.lwjgl.opengl.GL31.GL_RGB8_SNORM
org.lwjgl.opengl.GL31.GL_RGBA8_SNORM
org.lwjgl.opengl.GL31.GL_R16_SNORM
org.lwjgl.opengl.GL31.GL_RG16_SNORM
org.lwjgl.opengl.GL31.GL_RGBA16_SNORM
org.lwjgl.opengl.GL33.GL_RGB10_A2UI

group int gl_type
com.mojang.blaze3d.opengl.GlConst.GL_BYTE
Expand All @@ -97,10 +164,15 @@ group int gl_type
com.mojang.blaze3d.opengl.GlConst.GL_INT
com.mojang.blaze3d.opengl.GlConst.GL_UNSIGNED_INT
com.mojang.blaze3d.opengl.GlConst.GL_FLOAT
org.lwjgl.opengl.GL12.GL_UNSIGNED_INT_2_10_10_10_REV
org.lwjgl.opengl.GL20.GL_FLOAT_VEC2
org.lwjgl.opengl.GL20.GL_FLOAT_VEC3
org.lwjgl.opengl.GL20.GL_FLOAT_VEC4
org.lwjgl.opengl.GL20.GL_FLOAT_MAT4
org.lwjgl.opengl.GL30.GL_HALF_FLOAT
org.lwjgl.opengl.GL30.GL_UNSIGNED_INT_10F_11F_11F_REV
org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV
org.lwjgl.opengl.GL30.GL_UNSIGNED_INT_24_8

group int gl_framebuffer_attachment
com.mojang.blaze3d.opengl.GlConst.GL_COLOR_ATTACHMENT0
Expand All @@ -124,19 +196,6 @@ group int gl_arb_buffer_flags
org.lwjgl.opengl.ARBBufferStorage.GL_MAP_PERSISTENT_BIT
org.lwjgl.opengl.ARBBufferStorage.GL_MAP_COHERENT_BIT

# These appear to be Mojang-defined, not in GL.
group int gpu_buffer_flags
@flags
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_MAP_READ
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_MAP_WRITE
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_HINT_CLIENT_STORAGE
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_COPY_DST
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_COPY_SRC
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_VERTEX
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_INDEX
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_UNIFORM
com.mojang.blaze3d.buffers.GpuBuffer.USAGE_UNIFORM_TEXEL_BUFFER

# GlBlendState

group int gl_blend_equation_mode
Expand Down Expand Up @@ -192,6 +251,8 @@ group int gl_enable_state
org.lwjgl.opengl.GL11.GL_POLYGON_OFFSET_LINE
org.lwjgl.opengl.GL11.GL_COLOR_LOGIC_OP
org.lwjgl.opengl.GL11.GL_SCISSOR_TEST
org.lwjgl.opengl.GL32.GL_TEXTURE_CUBE_MAP_SEAMLESS
org.lwjgl.opengl.GL32.GL_PROGRAM_POINT_SIZE
org.lwjgl.opengl.GL43.GL_DEBUG_OUTPUT
org.lwjgl.opengl.GL43.GL_DEBUG_OUTPUT_SYNCHRONOUS

Expand Down Expand Up @@ -316,6 +377,27 @@ group int gl_blend_func_factor
com.mojang.blaze3d.opengl.GlConst.GL_ONE_MINUS_SRC_ALPHA
com.mojang.blaze3d.opengl.GlConst.GL_ONE_MINUS_SRC_COLOR

group int gl_clear_flags
@flags
org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT
org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT
org.lwjgl.opengl.GL11.GL_STENCIL_BUFFER_BIT

group int gl_get_pname
org.lwjgl.opengl.GL46.GL_MAX_TEXTURE_MAX_ANISOTROPY

group int gl_clip_control_origin
org.lwjgl.opengl.GL20.GL_LOWER_LEFT
org.lwjgl.opengl.GL20.GL_UPPER_LEFT

group int gl_clip_control_depth
org.lwjgl.opengl.GL45.GL_NEGATIVE_ONE_TO_ONE
org.lwjgl.opengl.GL45.GL_ZERO_TO_ONE

group int gl_buffer_binding_target
org.lwjgl.opengl.GL31.GL_COPY_READ_BUFFER
org.lwjgl.opengl.GL31.GL_COPY_WRITE_BUFFER

# TextureUtil
group int gl_pixel_store_pname
com.mojang.blaze3d.opengl.GlConst.GL_UNPACK_SWAP_BYTES
Expand Down Expand Up @@ -343,12 +425,27 @@ group int gl_buffer_mask

# Target definition

group int
@scope method com.mojang.blaze3d.opengl.GlConst <clinit> ()V
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP_POSITIVE_X
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP_NEGATIVE_X
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP_POSITIVE_Y
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP_POSITIVE_Z
org.lwjgl.opengl.GL13.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z

target_method com.mojang.blaze3d.opengl.GlConst toGl (Lcom/mojang/blaze3d/pipeline/DepthTest;)I
return gl_depth_test_function

target_method com.mojang.blaze3d.opengl.GlConst toGl (Lcom/mojang/blaze3d/platform/PolygonMode;)I
return gl_polygon_mode

target_method com.mojang.blaze3d.opengl.GlConst toGl (Lcom/mojang/blaze3d/pipeline/BlendParameter;)I
return gl_blend_func_factor

target_method com.mojang.blaze3d.opengl.GlConst toGl (Lcom/mojang/blaze3d/pipeline/BlendOperation;)I
return gl_blend_equation_mode

target_method com.mojang.blaze3d.opengl.GlConst toGl (Lcom/mojang/blaze3d/vertex/VertexFormat$DrawMode;)I
return gl_draw_mode

Expand All @@ -365,32 +462,27 @@ target_method com.mojang.blaze3d.opengl.GlConst toGl (Lcom/mojang/blaze3d/shader
return gl_program_type

target_method com.mojang.blaze3d.opengl.GlConst bufferUsageToGlEnum (I)I
param 0 gpu_buffer_flags
return gl_buffer_data_usage
target_method com.mojang.blaze3d.opengl.GlConst bufferUsageToGlFlag (I)I
param 0 gpu_buffer_flags
return gl_arb_buffer_flags

target_method com.mojang.blaze3d.opengl.GlConst glFormatChannelCount (I)I
param 0 gl_tex_format
target_method com.mojang.blaze3d.opengl.GlConst isGlFormatInteger (I)Z
param 0 gl_tex_format
target_method com.mojang.blaze3d.opengl.GlConst toGlInternalId (Lcom/mojang/blaze3d/textures/TexelFormat;)I
return gl_tex_format
target_method com.mojang.blaze3d.opengl.GlConst toGlExternalId (Lcom/mojang/blaze3d/textures/TexelFormat;)I
return gl_tex_format

target_method com.mojang.blaze3d.opengl.GlConst toGlType (Lcom/mojang/blaze3d/textures/TexelFormat;)I
return gl_type

target_method org.lwjgl.opengl.ARBDirectStateAccess glNamedBufferStorage (IJI)V
param 2 gl_arb_buffer_flags
target_method org.lwjgl.opengl.ARBDirectStateAccess glNamedBufferStorage (ILjava/nio/ByteBuffer;I)V
param 2 gl_arb_buffer_flags

target_method net.minecraft.client.gl.BufferManager setBufferData (IJI)V
param 2 gpu_buffer_flags
target_method net.minecraft.client.gl.BufferManager setBufferData (ILjava/nio/ByteBuffer;I)V
param 2 gpu_buffer_flags
target_method net.minecraft.client.gl.BufferManager setBufferStorage (IJI)V
param 2 gpu_buffer_flags
target_method net.minecraft.client.gl.BufferManager setBufferStorage (ILjava/nio/ByteBuffer;I)V
param 2 gpu_buffer_flags
target_method net.minecraft.client.gl.BufferManager unmapBuffer (II)V
param 1 gpu_buffer_flags
target_method com.mojang.blaze3d.systems.GpuDevice createBuffer (Ljava/util/function/Supplier;ILjava/nio/ByteBuffer;)Lcom/mojang/blaze3d/buffers/GpuBuffer;
param 1 gpu_buffer_flags
target_method com.mojang.blaze3d.vertex.VertexFormat uploadToBuffer (Lcom/mojang/blaze3d/buffers/GpuBuffer;Ljava/nio/ByteBuffer;ILjava/util/function/Supplier;)Lcom/mojang/blaze3d/buffers/GpuBuffer;
param 2 gpu_buffer_flags

target_method org.lwjgl.opengl.GL30 glBindFramebuffer (II)V
param 0 gl_framebuffer_target
target_method com.mojang.blaze3d.opengl.GlStateManager _glBindFramebuffer (II)V
Expand Down Expand Up @@ -540,9 +632,6 @@ target_method org.lwjgl.opengl.ARBBufferStorage glBufferStorage (ILjava/nio/Byte
param 0 gl_buffer_target
param 2 gl_arb_buffer_flags

target_method com.mojang.blaze3d.buffers.GpuBuffer usage ()I
return gpu_buffer_flags

target_method com.mojang.blaze3d.opengl.GlStateManager _getError ()I
return gl_error

Expand All @@ -568,3 +657,25 @@ target_method org.lwjgl.opengl.KHRDebug glObjectLabel (IILjava/lang/CharSequence
target_method org.lwjgl.opengl.EXTDebugLabel glLabelObjectEXT (IILjava/lang/CharSequence;)V
param 0 gl_ext_label_identifier

target_method com.mojang.blaze3d.opengl.GlStateManager glCreateShader (I)I
param 0 gl_program_type

target_method com.mojang.blaze3d.opengl.GlStateManager _clear (I)V
param 0 gl_clear_flags

target_method com.mojang.blaze3d.opengl.GlStateManager _activeTexture (I)V
param 0 gl_texture

target_field com.mojang.blaze3d.opengl.GlStateManager$DepthTestState func I gl_depth_test_function
target_field com.mojang.blaze3d.opengl.GlStateManager$LogicOpState op I gl_logic_op

target_method org.lwjgl.opengl.GL11 glGetFloat (I)F
param 0 gl_get_pname

target_method org.lwjgl.opengl.ARBClipControl glClipControl (II)V
param 0 gl_clip_control_origin
param 1 gl_clip_control_depth

target_method org.lwjgl.opengl.GL31 glCopyBufferSubData (IIJJJ)V
param 0 gl_buffer_binding_target
param 1 gl_buffer_binding_target
Loading