Skip to content

Commit

Permalink
25w09a rendering stuff (#4138)
Browse files Browse the repository at this point in the history
* 25w09a rendering stuff

* 25w09b

* remove invalid

* implement suggestions from apple

* unfortunate name colliding tripped up enigma

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
0x3C50 and github-actions[bot] authored Mar 1, 2025
1 parent c1927ff commit 29739e7
Show file tree
Hide file tree
Showing 32 changed files with 475 additions and 33 deletions.
4 changes: 4 additions & 0 deletions mappings/com/mojang/blaze3d/systems/RenderSystem.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ CLASS com/mojang/blaze3d/systems/RenderSystem
ARG 0 drawMode
METHOD getShaderTexture (I)Lnet/minecraft/class_10792;
ARG 0 texture
METHOD initRenderer (JIZLjava/util/function/BiFunction;Z)V
ARG 0 windowHandle
ARG 2 debugVerbosity
ARG 5 renderDebugLabels
METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/ints/IntConsumer;I)V
ARG 0 indexConsumer
ARG 1 firstVertexIndex
Expand Down
7 changes: 0 additions & 7 deletions mappings/net/minecraft/class_10859.mapping

This file was deleted.

2 changes: 0 additions & 2 deletions mappings/net/minecraft/class_10865.mapping

This file was deleted.

2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/RunArgs.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs
FIELD field_3292 demo Z
FIELD field_3293 version Ljava/lang/String;
FIELD field_54272 tracyEnabled Z
FIELD field_57923 renderDebugLabels Z
METHOD <init> (ZLjava/lang/String;Ljava/lang/String;ZZZZ)V
ARG 1 demo
ARG 2 version
ARG 3 versionType
ARG 4 multiplayerDisabled
ARG 5 onlineChatDisabled
ARG 6 tracyEnabled
ARG 7 renderDebugLabels
CLASS class_547 Network
FIELD field_3296 netProxy Ljava/net/Proxy;
FIELD field_3297 profileProperties Lcom/mojang/authlib/properties/PropertyMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_10873 net/minecraft/client/gl/ARBDirectFramebufferManager
29 changes: 29 additions & 0 deletions mappings/net/minecraft/client/gl/BufferManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
CLASS net/minecraft/class_10869 net/minecraft/client/gl/BufferManager
METHOD method_68428 setupBuffer (Lnet/minecraft/class_293;Lnet/minecraft/class_10859;)V
ARG 1 format
ARG 2 into
METHOD method_68429 createManager (Lorg/lwjgl/opengl/GLCapabilities;Lnet/minecraft/class_10861;Ljava/util/Set;)Lnet/minecraft/class_10869;
ARG 0 caps
ARG 1 labeler
ARG 2 usedCaps
CLASS class_10870 DefaultBufferManager
FIELD field_57889 cache Ljava/util/Map;
FIELD field_57890 labeler Lnet/minecraft/class_10861;
METHOD <init> (Lnet/minecraft/class_10861;)V
ARG 1 labeler
METHOD method_68430 setupVba (Lnet/minecraft/class_293;Z)V
ARG 0 format
ARG 1 vbaIsNew
CLASS class_10871 ARBBufferManager
FIELD field_57891 cache Ljava/util/Map;
FIELD field_57892 labeler Lnet/minecraft/class_10861;
METHOD <init> (Lnet/minecraft/class_10861;)V
ARG 1 labeler
CLASS class_10872 AllocatedBuffer
FIELD field_57893 glId I
FIELD field_57894 format Lnet/minecraft/class_293;
FIELD field_57895 buffer Lnet/minecraft/class_10859;
METHOD <init> (ILnet/minecraft/class_293;Lnet/minecraft/class_10859;)V
ARG 1 glId
ARG 2 format
ARG 3 buffer
4 changes: 4 additions & 0 deletions mappings/net/minecraft/client/gl/CompiledShader.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ CLASS net/minecraft/class_10141 net/minecraft/client/gl/CompiledShader
FIELD field_53827 CLOSED I
FIELD field_53828 id Lnet/minecraft/class_2960;
FIELD field_53829 handle I
FIELD field_57880 INVALID_SHADER Lnet/minecraft/class_10141;
FIELD field_57881 type Lnet/minecraft/class_282;
METHOD <init> (ILnet/minecraft/class_2960;Lnet/minecraft/class_282;)V
ARG 1 handle
ARG 2 path
ARG 3 type
METHOD method_62881 getId ()Lnet/minecraft/class_2960;
METHOD method_62882 compile (Lnet/minecraft/class_2960;Lnet/minecraft/class_282;Ljava/lang/String;)Lnet/minecraft/class_10141;
ARG 0 id
ARG 1 type
ARG 2 source
METHOD method_62883 getHandle ()I
METHOD method_68423 getDebugLabel ()Ljava/lang/String;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_10867 net/minecraft/client/gl/CompiledShaderPipeline
21 changes: 21 additions & 0 deletions mappings/net/minecraft/client/gl/DebugLabelManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CLASS net/minecraft/class_10861 net/minecraft/client/gl/DebugLabelManager
FIELD field_57851 LOGGER Lorg/slf4j/Logger;
METHOD method_68370 debugLabelsAvailable ()Z
METHOD method_68371 labelGlGpuBuffer (Lnet/minecraft/class_10859;)V
ARG 1 buf
METHOD method_68372 labelShaderProgram (Lnet/minecraft/class_5944;)V
ARG 1 program
METHOD method_68373 labelCompiledShader (Lnet/minecraft/class_10141;)V
ARG 1 shader
METHOD method_68374 labelGlTexture (Lnet/minecraft/class_10868;)V
ARG 1 tex
METHOD method_68375 labelAllocatedBuffer (Lnet/minecraft/class_10869$class_10872;)V
ARG 1 buffer
METHOD method_68376 getLabelManager (Lorg/lwjgl/opengl/GLCapabilities;ZLjava/util/Set;)Lnet/minecraft/class_10861;
ARG 0 caps
ARG 1 debugEnabled
ARG 2 usedCaps
CLASS class_10862 KHRDebugLabelManager
FIELD field_57852 maxLabelLength I
CLASS class_10863 NoOpDebugLabelManager
CLASS class_10864 EXTDebugLabelManager
8 changes: 8 additions & 0 deletions mappings/net/minecraft/client/gl/FramebufferManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/class_10874 net/minecraft/client/gl/FramebufferManager
METHOD method_68431 makeFramebuffer ()I
METHOD method_68432 setupFramebuffer (IIIIZ)V
ARG 1 framebuffer
ARG 2 colorAttachment
ARG 3 depthAttachment
ARG 4 mipLevel
ARG 5 bindFramebuffer
44 changes: 44 additions & 0 deletions mappings/net/minecraft/client/gl/GlBackend.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
CLASS net/minecraft/class_10865 net/minecraft/client/gl/GlBackend
FIELD field_57853 LOG Lorg/slf4j/Logger;
FIELD field_57854 resourceManager Lnet/minecraft/class_10881;
FIELD field_57855 glDebug Lnet/minecraft/class_1008;
FIELD field_57856 debugLabelManager Lnet/minecraft/class_10861;
FIELD field_57857 maxTexSize I
FIELD field_57858 fbManager Lnet/minecraft/class_10874;
FIELD field_57859 defaultShaderSourceGetter Ljava/util/function/BiFunction;
FIELD field_57860 shaderPipelineCompCache Ljava/util/Map;
FIELD field_57861 shaderKeyCompCache Ljava/util/Map;
FIELD field_57862 bufferManager Lnet/minecraft/class_10869;
FIELD field_58035 permitGlArbVABinding Z
FIELD field_58036 permitGlKhrDebug Z
FIELD field_58037 permitExtDebugLabel Z
FIELD field_58038 permitGlArbDebugOutput Z
FIELD field_58039 permitGlArbDirectAccess Z
FIELD field_58040 usedGlCaps Ljava/util/Set;
METHOD <init> (JIZLjava/util/function/BiFunction;Z)V
ARG 1 contextId
ARG 3 debugVerbosity
ARG 5 shaderSourceGetter
ARG 6 renderDebugLabels
METHOD method_68377 getDebugLabelManager ()Lnet/minecraft/class_10861;
METHOD method_68378 compileShader (Lnet/minecraft/class_2960;Lnet/minecraft/class_282;Lnet/minecraft/class_10149;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10141;
ARG 1 which
ARG 2 type
ARG 3 defines
ARG 4 sourceRetriever
METHOD method_68379 compileShader (Lnet/minecraft/class_10865$class_10154;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10141;
ARG 1 which
ARG 2 sourceRetriever
METHOD method_68381 compileShaderPipelineCached (Lnet/minecraft/class_10785;)Lnet/minecraft/class_10867;
ARG 1 pipeline
METHOD method_68382 (Lnet/minecraft/class_10785;Lnet/minecraft/class_10785;)Lnet/minecraft/class_10867;
ARG 2 unused
METHOD method_68384 (Lnet/minecraft/class_10785;Ljava/util/function/BiFunction;Lnet/minecraft/class_10785;)Lnet/minecraft/class_10867;
ARG 3 unused
METHOD method_68392 compileShaderPipeline (Lnet/minecraft/class_10785;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10867;
ARG 1 pipeline
ARG 2 shaderSourceGetter
METHOD method_68401 getFramebufferManager ()Lnet/minecraft/class_10874;
METHOD method_68402 getBufferManager ()Lnet/minecraft/class_10869;
METHOD method_68403 determineMaxTexSize ()I
CLASS class_10154 ShaderKey
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/gl/GlDebug.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug
METHOD method_4227 enableDebug (IZLjava/util/Set;)Lnet/minecraft/class_1008;
ARG 0 verbosity
ARG 1 sync
ARG 2 usedGlCaps
METHOD method_4228 getType (I)Ljava/lang/String;
ARG 0 opcode
CLASS class_6359 DebugMessage
Expand Down
20 changes: 20 additions & 0 deletions mappings/net/minecraft/client/gl/GlGpuBuffer.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
CLASS net/minecraft/class_10859 net/minecraft/client/gl/GlGpuBuffer
FIELD field_57838 POOL Lcom/mojang/jtracy/MemoryPool;
FIELD field_57839 closed Z
FIELD field_57840 hasData Z
FIELD field_57841 debugLabelSupplier Ljava/util/function/Supplier;
FIELD field_57842 id I
METHOD <init> (Lnet/minecraft/class_10861;Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;II)V
ARG 1 debugLabelMgr
ARG 2 debugLabelSupplier
ARG 3 target
ARG 4 usage
ARG 5 size
ARG 6 id
METHOD method_68345 ensureAllocated ()V
CLASS class_10228 ReadResultImpl
FIELD field_54357 handle I
FIELD field_54358 buf Ljava/nio/ByteBuffer;
METHOD <init> (ILjava/nio/ByteBuffer;)V
ARG 1 handle
ARG 2 buf
33 changes: 33 additions & 0 deletions mappings/net/minecraft/client/gl/GlResourceManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
CLASS net/minecraft/class_10860 net/minecraft/client/gl/GlResourceManager
FIELD field_57843 LOG Lorg/slf4j/Logger;
FIELD field_57844 backend Lnet/minecraft/class_10865;
FIELD field_57845 temporaryFb1 I
FIELD field_57846 temporaryFb2 I
FIELD field_57847 currentPipeline Lnet/minecraft/class_10785;
FIELD field_57848 renderPassOpen Z
FIELD field_57849 currentProgram Lnet/minecraft/class_5944;
METHOD <init> (Lnet/minecraft/class_10865;)V
ARG 1 backend
METHOD method_68346 closePass ()V
METHOD method_68351 setupRenderPass (Lnet/minecraft/class_10866;)Z
ARG 1 pass
METHOD method_68352 drawBoundObjectWithRenderPass (Lnet/minecraft/class_10866;IILnet/minecraft/class_293$class_5595;)V
ARG 1 pass
ARG 2 offset
ARG 3 count
ARG 4 type
METHOD method_68353 drawObjectWithRenderPass (Lnet/minecraft/class_10866;IILnet/minecraft/class_293$class_5595;Lnet/minecraft/class_10867;)V
ARG 1 pass
ARG 2 offset
ARG 3 count
ARG 4 indexType
ARG 5 pipeline
METHOD method_68354 (Lnet/minecraft/class_10866;Ljava/lang/String;[F)V
ARG 1 name
ARG 2 values
METHOD method_68355 drawObjectsWithRenderPass (Lnet/minecraft/class_10866;Ljava/util/Collection;)V
ARG 1 pass
ARG 2 drawObjects
METHOD method_68356 setPipelineAndApplyState (Lnet/minecraft/class_10785;)V
ARG 1 pipeline
METHOD method_68369 getBackend ()Lnet/minecraft/class_10865;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/gl/GlUniform.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform
FIELD field_1548 LOGGER Lorg/slf4j/Logger;
FIELD field_1549 floatData Ljava/nio/FloatBuffer;
FIELD field_56740 type Lnet/minecraft/class_10789;
FIELD field_57886 dirty Z
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_10789;)V
ARG 1 name
ARG 2 type
Expand Down
5 changes: 4 additions & 1 deletion mappings/net/minecraft/client/gl/GlUsage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ CLASS net/minecraft/class_8555 net/minecraft/client/gl/GlUsage
FIELD field_54348 readable Z
FIELD field_54349 writable Z
METHOD <init> (Ljava/lang/String;IZZ)V
ARG 4 readable
ARG 3 readable
ARG 4 writable
METHOD method_68341 isReadable ()Z
METHOD method_68342 isWritable ()Z
9 changes: 8 additions & 1 deletion mappings/net/minecraft/client/gl/GpuBuffer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ CLASS net/minecraft/class_10227 net/minecraft/client/gl/GpuBuffer
FIELD field_54351 size I
FIELD field_54353 target Lnet/minecraft/class_10226;
FIELD field_54354 usage Lnet/minecraft/class_8555;
METHOD <init> (Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;I)V
ARG 1 target
ARG 2 usage
ARG 3 size
METHOD close close ()V
METHOD method_68151 getSize ()I
METHOD method_68152 getTarget ()Lnet/minecraft/class_10226;
CLASS class_10858
METHOD method_68343 getUsage ()Lnet/minecraft/class_8555;
CLASS class_10858 ReadResult
METHOD close close ()V
METHOD method_64323 getBuf ()Ljava/nio/ByteBuffer;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_10875 net/minecraft/client/gl/LegacyGlFramebufferManager
41 changes: 41 additions & 0 deletions mappings/net/minecraft/client/gl/RenderBackend.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
CLASS net/minecraft/class_10882 net/minecraft/client/gl/RenderBackend
METHOD method_68385 createTexture (Ljava/lang/String;Lnet/minecraft/class_10793;III)Lnet/minecraft/class_10792;
ARG 1 label
ARG 2 type
ARG 3 width
ARG 4 height
ARG 5 mipLevels
METHOD method_68386 createBuffer (Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;I)Lnet/minecraft/class_10227;
ARG 1 debugLabelSupplier
ARG 2 target
ARG 3 usage
ARG 4 size
METHOD method_68387 createBuffer (Ljava/util/function/Supplier;Lnet/minecraft/class_10226;Lnet/minecraft/class_8555;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_10227;
ARG 1 debugLabelSupplier
ARG 2 target
ARG 3 usage
ARG 4 source
METHOD method_68388 createTexture (Ljava/util/function/Supplier;Lnet/minecraft/class_10793;III)Lnet/minecraft/class_10792;
ARG 1 labelGetter
ARG 2 type
ARG 3 width
ARG 4 height
ARG 5 mipLevels
METHOD method_68389 getResourceManager ()Lnet/minecraft/class_10881;
METHOD method_68390 compileShaderPipelineCached (Lnet/minecraft/class_10785;Ljava/util/function/BiFunction;)Lnet/minecraft/class_10878;
COMMENT Compiles shader pipeline {@code pipeline}, using custom source retriever {@code shaderSourceGetter}.
COMMENT If {@code shaderSourceGetter} is null, this is equivalent to {@link #compileShaderPipelineCached(ShaderPipeline) compileShaderPipelineCached(pipeline)}.
ARG 1 pipeline
ARG 2 shaderSourceGetter
METHOD method_68391 getDebugString ()Ljava/lang/String;
METHOD method_68393 getDebugMessages ()Ljava/util/List;
METHOD method_68394 hasDebug ()Z
METHOD method_68395 getBackendRenderer ()Ljava/lang/String;
METHOD method_68396 getBackendVendor ()Ljava/lang/String;
METHOD method_68397 getBackendName ()Ljava/lang/String;
METHOD method_68398 getBackendVersion ()Ljava/lang/String;
METHOD method_68399 getMaxTexSize ()I
METHOD method_68400 release ()V
METHOD method_68451 compileShaderPipelineCachedNoLabel (Lnet/minecraft/class_10785;)Lnet/minecraft/class_10878;
ARG 1 pipeline
METHOD method_68669 getUsedGlCaps ()Ljava/util/List;
18 changes: 18 additions & 0 deletions mappings/net/minecraft/client/gl/RenderPassImpl.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CLASS net/minecraft/class_10866 net/minecraft/client/gl/RenderPassImpl
FIELD field_57867 isDevelopment Z
FIELD field_57868 pipeline Lnet/minecraft/class_10867;
FIELD field_57869 vertexBuffers [Lnet/minecraft/class_10227;
FIELD field_57870 indexBuffer Lnet/minecraft/class_10227;
FIELD field_57871 indexType Lnet/minecraft/class_293$class_5595;
FIELD field_57872 scissorBox Lnet/minecraft/class_10886;
FIELD field_57873 simpleUniforms Ljava/util/HashMap;
FIELD field_57874 samplerUniforms Ljava/util/HashMap;
FIELD field_57875 setSimpleUniforms Ljava/util/Set;
FIELD field_57876 setSamplers Ljava/util/Set;
FIELD field_57877 resourceManager Lnet/minecraft/class_10860;
FIELD field_57878 hasDepth Z
FIELD field_57879 closed Z
METHOD <init> (Lnet/minecraft/class_10860;Z)V
ARG 1 resourceManager
ARG 2 hasDepth
METHOD method_68407 hasDepth ()Z
Loading

0 comments on commit 29739e7

Please sign in to comment.