Fix issues that directly affects Euphoria Patches + Complementary (#1782)

This commit is contained in:
Eclipse-Sol authored and GitHub committed 2026-05-26 14:11:33 -07:00
1 parent 9c45549e35
commit 865de3cbab
16 files changed
+95 -31

No files matched your search

@@ -90,6 +90,7 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL42;
import org.lwjgl.opengl.GL43;
import java.util.ArrayList;
import java.util.Collections;
@@ -517,7 +518,7 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
}
if (hasSetup) {
ComputeProgram.unbind();
RenderSystem.memoryBarrier(GL42.GL_SHADER_IMAGE_ACCESS_BARRIER_BIT | GL42.GL_TEXTURE_FETCH_BARRIER_BIT);
RenderSystem.memoryBarrier(GL42.GL_SHADER_IMAGE_ACCESS_BARRIER_BIT | GL42.GL_TEXTURE_FETCH_BARRIER_BIT | GL43.GL_SHADER_STORAGE_BARRIER_BIT);
}
// Terrain pipeline sampler/image factory setup follows.
@@ -771,11 +772,11 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
public boolean shouldOverrideShaders() {
return isRenderingWorld && !isRenderingFullScreenPass && !isPostChain && isMainBound;
}
public Pass getActivePassProgram() {
return current;
}
public int getActivePassProgramId() {
if (current == null) return -1;
final Program p = current.getProgram();
@@ -793,10 +794,10 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
if (!isRenderingWorld || isRenderingFullScreenPass || isPostChain || !isMainBound) {
return;
}
final RenderCondition condition = getCondition(getPhase());
final Pass matched = table.match(condition, inputs);
beginPass(matched);
}
@@ -1332,7 +1333,7 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
}
if (ranSetup) {
ComputeProgram.unbind();
RenderSystem.memoryBarrier(GL42.GL_SHADER_IMAGE_ACCESS_BARRIER_BIT | GL42.GL_TEXTURE_FETCH_BARRIER_BIT);
RenderSystem.memoryBarrier(GL42.GL_SHADER_IMAGE_ACCESS_BARRIER_BIT | GL42.GL_TEXTURE_FETCH_BARRIER_BIT | GL43.GL_SHADER_STORAGE_BARRIER_BIT);
}
}