-
-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separate ClientModLoader begin/finish into two methods, implement Mai…
…nTarget configuration event
- Loading branch information
1 parent
c0dbe21
commit 155b835
Showing
6 changed files
with
237 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- a/com/mojang/blaze3d/pipeline/MainTarget.java | ||
| +++ b/com/mojang/blaze3d/pipeline/MainTarget.java | ||
| @@ -16,7 +_,11 @@ | ||
| static final MainTarget.Dimension DEFAULT_DIMENSIONS = new MainTarget.Dimension(854, 480); | ||
|
|
||
| public MainTarget(int p_166137_, int p_166138_) { | ||
| - super(true); | ||
| + this(net.neoforged.neoforge.client.ClientHooks.configureMainRenderTarget(), p_166137_, p_166138_); | ||
| + } | ||
| + | ||
| + private MainTarget(net.neoforged.neoforge.client.event.ConfigureMainRenderTargetEvent e, int p_166137_, int p_166138_) { | ||
| + super(e.useDepth(), e.useStencil()); | ||
| this.createFrameBuffer(p_166137_, p_166138_); | ||
| } | ||
|
|
134 changes: 134 additions & 0 deletions
134
patches/com/mojang/blaze3d/pipeline/RenderTarget.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| --- a/com/mojang/blaze3d/pipeline/RenderTarget.java | ||
| +++ b/com/mojang/blaze3d/pipeline/RenderTarget.java | ||
| @@ -25,17 +_,31 @@ | ||
| public int viewWidth; | ||
| public int viewHeight; | ||
| public final boolean useDepth; | ||
| + public final boolean useStencil; | ||
| public int frameBufferId; | ||
| protected int colorTextureId; | ||
| protected int depthBufferId; | ||
| + protected int stencilBufferId; | ||
| private final float[] clearChannels = Util.make(() -> new float[]{1.0F, 1.0F, 1.0F, 0.0F}); | ||
| public int filterMode; | ||
|
|
||
| public RenderTarget(boolean p_166199_) { | ||
| - this.useDepth = p_166199_; | ||
| + this(p_166199_, false); | ||
| + } | ||
| + | ||
| + public RenderTarget(boolean useDepth, boolean useStencil) { | ||
| + this.useDepth = useDepth; | ||
| + this.useStencil = useStencil; | ||
| this.frameBufferId = -1; | ||
| this.colorTextureId = -1; | ||
| this.depthBufferId = -1; | ||
| + | ||
| + if (!useDepth && useStencil) { | ||
| + var capabilities = org.lwjgl.opengl.GL.getCapabilities(); | ||
| + if (!capabilities.GL_ARB_texture_stencil8 && !capabilities.OpenGL44) { | ||
| + throw new UnsupportedOperationException("Stencil-only buffers require GL_ARB_texture_stencil8 OR OpenGL 4.4"); | ||
| + } | ||
| + } | ||
| } | ||
|
|
||
| public void resize(int p_83942_, int p_83943_) { | ||
| @@ -53,6 +_,11 @@ | ||
| RenderSystem.assertOnRenderThreadOrInit(); | ||
| this.unbindRead(); | ||
| this.unbindWrite(); | ||
| + if (this.stencilBufferId > -1 && this.stencilBufferId != this.depthBufferId) { | ||
| + TextureUtil.releaseTextureId(this.stencilBufferId);; | ||
| + this.stencilBufferId = -1; | ||
| + } | ||
| + | ||
| if (this.depthBufferId > -1) { | ||
| TextureUtil.releaseTextureId(this.depthBufferId); | ||
| this.depthBufferId = -1; | ||
| @@ -96,9 +_,50 @@ | ||
| GlStateManager._texParameter(3553, 34892, 0); | ||
| GlStateManager._texParameter(3553, 10242, 33071); | ||
| GlStateManager._texParameter(3553, 10243, 33071); | ||
| + if (!this.useStencil) // If stenciling is enabled, we will fill this later | ||
| GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null); | ||
| } | ||
|
|
||
| + if (this.useStencil) { | ||
| + if (this.useDepth) { | ||
| + // If depth and stencil buffers are both enabled, we must combine them | ||
| + this.stencilBufferId = this.depthBufferId; | ||
| + } else { | ||
| + // Otherwise, we can generate a new texture in its place. | ||
| + this.stencilBufferId = TextureUtil.generateTextureId(); | ||
| + GlStateManager._bindTexture(this.stencilBufferId); | ||
| + GlStateManager._texParameter(3553, 10241, 9728); | ||
| + GlStateManager._texParameter(3553, 10240, 9728); | ||
| + GlStateManager._texParameter(3553, 34892, 0); | ||
| + GlStateManager._texParameter(3553, 10242, 33071); | ||
| + GlStateManager._texParameter(3553, 10243, 33071); | ||
| + } | ||
| + | ||
| + if (this.useDepth) { | ||
| + // Use a combined format for both depth and stencil. | ||
| + GlStateManager._texImage2D( | ||
| + org.lwjgl.opengl.GL32.GL_TEXTURE_2D, | ||
| + 0, | ||
| + org.lwjgl.opengl.GL32.GL_DEPTH24_STENCIL8, | ||
| + this.width, this.height, | ||
| + 0, | ||
| + org.lwjgl.opengl.GL32.GL_DEPTH_STENCIL, | ||
| + org.lwjgl.opengl.GL32.GL_UNSIGNED_INT_24_8, | ||
| + null); | ||
| + } else { | ||
| + // Otherwise, we can use a separate format. Testing for this was done in the constructor already. | ||
| + GlStateManager._texImage2D( | ||
| + org.lwjgl.opengl.GL32.GL_TEXTURE_2D, | ||
| + 0, | ||
| + org.lwjgl.opengl.GL32.GL_STENCIL_INDEX8, | ||
| + this.width, this.height, | ||
| + 0, | ||
| + org.lwjgl.opengl.GL32.GL_STENCIL_INDEX, | ||
| + org.lwjgl.opengl.GL32.GL_BYTE, | ||
| + null); | ||
| + } | ||
| + } | ||
| + | ||
| this.setFilterMode(9728, true); | ||
| GlStateManager._bindTexture(this.colorTextureId); | ||
| GlStateManager._texParameter(3553, 10242, 33071); | ||
| @@ -109,6 +_,14 @@ | ||
| if (this.useDepth) { | ||
| GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0); | ||
| } | ||
| + if (this.useStencil) { | ||
| + GlStateManager._glFramebufferTexture2D( | ||
| + org.lwjgl.opengl.GL32.GL_FRAMEBUFFER, | ||
| + org.lwjgl.opengl.GL32.GL_STENCIL_ATTACHMENT, | ||
| + org.lwjgl.opengl.GL32.GL_TEXTURE_2D, | ||
| + this.stencilBufferId, | ||
| + 0); | ||
| + } | ||
|
|
||
| this.checkStatus(); | ||
| this.clear(); | ||
| @@ -218,6 +_,10 @@ | ||
| GlStateManager._clearDepth(1.0); | ||
| i |= 256; | ||
| } | ||
| + if (this.useStencil) { | ||
| + GlStateManager._clearStencil(0); | ||
| + i |= org.lwjgl.opengl.GL32.GL_STENCIL_BUFFER_BIT; | ||
| + } | ||
|
|
||
| GlStateManager._clear(i); | ||
| this.unbindWrite(); | ||
| @@ -229,5 +_,9 @@ | ||
|
|
||
| public int getDepthTextureId() { | ||
| return this.depthBufferId; | ||
| + } | ||
| + | ||
| + public int getStencilBufferId() { | ||
| + return this.stencilBufferId; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
src/main/java/net/neoforged/neoforge/client/event/ConfigureMainRenderTargetEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Copyright (c) NeoForged and contributors | ||
| * SPDX-License-Identifier: LGPL-2.1-only | ||
| */ | ||
|
|
||
| package net.neoforged.neoforge.client.event; | ||
|
|
||
| import com.mojang.blaze3d.pipeline.MainTarget; | ||
| import com.mojang.blaze3d.pipeline.RenderTarget; | ||
| import net.neoforged.bus.api.Event; | ||
| import net.neoforged.bus.api.ICancellableEvent; | ||
| import net.neoforged.fml.LogicalSide; | ||
| import net.neoforged.fml.event.IModBusEvent; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
|
|
||
| /** | ||
| * Fired when configuring the main {@linkplain RenderTarget render target}. | ||
| * <p> | ||
| * This event fires during startup when the {@link MainTarget} is constructed. | ||
| * <p> | ||
| * This event is not {@linkplain ICancellableEvent cancellable}. | ||
| * <p> | ||
| * This event is fired on the mod-speciffic event bus, only on the {@linkplain LogicalSide#CLIENT logical client}. | ||
| */ | ||
| public class ConfigureMainRenderTargetEvent extends Event implements IModBusEvent { | ||
| private boolean useDepth; | ||
| private boolean useStencil; | ||
|
|
||
| @ApiStatus.Internal | ||
| public ConfigureMainRenderTargetEvent() { | ||
| this.useDepth = true; | ||
| this.useStencil = false; | ||
| } | ||
|
|
||
| /** | ||
| * Returns whether the depth buffer is enabled. | ||
| * | ||
| * @return <code>true</code>, if the depth buffer is enabled, or <code>false</code> otherwise. | ||
| */ | ||
| public boolean useDepth() { | ||
| return this.useDepth; | ||
| } | ||
|
|
||
| /** | ||
| * Returns whether the stencil buffer is enabled. | ||
| * | ||
| * @return <code>true</code>, if the stencil buffer is enabled, or <code>false</code> otherwise. | ||
| */ | ||
| public boolean useStencil() { | ||
| return this.useStencil; | ||
| } | ||
|
|
||
| /** | ||
| * Enable the depth buffer for the main render target. | ||
| * | ||
| * @return <code>this</code>, for method chaining. | ||
| */ | ||
| public ConfigureMainRenderTargetEvent enableDepth() { | ||
| this.useDepth = true; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Enable the stencil buffer for the main render target. | ||
| * | ||
| * @return <code>this</code>, for method chaining. | ||
| */ | ||
| public ConfigureMainRenderTargetEvent enableStencil() { | ||
| this.useStencil = true; | ||
| return this; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters