mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 03:49:22 +00:00
Backport MemoryStack to reduce direct buffer allocations (#751)
* Initial MemoryStack backport * Remove stubs, for now Will re-add as needed * Implement mallocInt * Replace some buffer allocation * Add mallocFloat * Replace more uses of direct buffer allocation * Reorder methods Fixes a clinit crash and makes it easier to compare to upstream * Remove another direct buffer creation
This commit is contained in:
1 parent
78072236d2
commit
c353c83cf3
13 files changed
+808
-97
No files matched your search
@@ -1,19 +1,18 @@
|
||||
package net.coderbot.iris.gl.framebuffer;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.lwjgl.MemoryStack;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntArrayMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntMap;
|
||||
import java.nio.IntBuffer;
|
||||
import net.coderbot.iris.gl.GlResource;
|
||||
import net.coderbot.iris.gl.texture.DepthBufferFormat;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL20;
|
||||
import org.lwjgl.opengl.GL30;
|
||||
|
||||
import java.nio.IntBuffer;
|
||||
|
||||
public class GlFramebuffer extends GlResource {
|
||||
private final Int2IntMap attachments;
|
||||
private final int maxDrawBuffers;
|
||||
@@ -52,25 +51,29 @@ public class GlFramebuffer extends GlResource {
|
||||
}
|
||||
|
||||
public void noDrawBuffers() {
|
||||
final IntBuffer buffer = BufferUtils.createIntBuffer(1);
|
||||
buffer.put(GL11.GL_NONE);
|
||||
RenderSystem.drawBuffers(getGlId(), buffer);
|
||||
try (MemoryStack stack = MemoryStack.stackPush()) {
|
||||
final IntBuffer buffer = stack.mallocInt(1);
|
||||
buffer.put(GL11.GL_NONE);
|
||||
RenderSystem.drawBuffers(getGlId(), buffer);
|
||||
}
|
||||
}
|
||||
|
||||
public void drawBuffers(int[] buffers) {
|
||||
final IntBuffer glBuffers = BufferUtils.createIntBuffer(buffers.length);
|
||||
int index = 0;
|
||||
try (MemoryStack stack = MemoryStack.stackPush()) {
|
||||
final IntBuffer glBuffers = stack.mallocInt(buffers.length);
|
||||
int index = 0;
|
||||
|
||||
if (buffers.length > maxDrawBuffers) {
|
||||
throw new IllegalArgumentException("Cannot write to more than " + maxDrawBuffers + " draw buffers on this GPU");
|
||||
}
|
||||
for (int buffer : buffers) {
|
||||
if (buffer >= maxColorAttachments) {
|
||||
throw new IllegalArgumentException("Only " + maxColorAttachments + " color attachments are supported on this GPU, but an attempt was made to write to a color attachment with index " + buffer);
|
||||
}
|
||||
glBuffers.put(index++, GL30.GL_COLOR_ATTACHMENT0 + buffer);
|
||||
}
|
||||
RenderSystem.drawBuffers(getGlId(), glBuffers);
|
||||
if (buffers.length > maxDrawBuffers) {
|
||||
throw new IllegalArgumentException("Cannot write to more than " + maxDrawBuffers + " draw buffers on this GPU");
|
||||
}
|
||||
for (int buffer : buffers) {
|
||||
if (buffer >= maxColorAttachments) {
|
||||
throw new IllegalArgumentException("Only " + maxColorAttachments + " color attachments are supported on this GPU, but an attempt was made to write to a color attachment with index " + buffer);
|
||||
}
|
||||
glBuffers.put(index++, GL30.GL_COLOR_ATTACHMENT0 + buffer);
|
||||
}
|
||||
RenderSystem.drawBuffers(getGlId(), glBuffers);
|
||||
}
|
||||
}
|
||||
|
||||
public void readBuffer(int buffer) {
|
||||
|
||||
@@ -19,7 +19,7 @@ public final class ComputeProgram extends GlResource {
|
||||
private Vector3i absoluteWorkGroups;
|
||||
private Vector2f relativeWorkGroups;
|
||||
// private int[] localSize;
|
||||
private IntBuffer localSizeBuffer;
|
||||
private final IntBuffer localSizeBuffer;
|
||||
private float cachedWidth;
|
||||
private float cachedHeight;
|
||||
private Vector3i cachedWorkGroups;
|
||||
|
||||
@@ -5,12 +5,14 @@ import com.gtnewhorizons.angelica.compat.mojang.Camera;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
|
||||
import com.gtnewhorizons.angelica.rendering.RenderingState;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.shaderpack.OptionalBoolean;
|
||||
import net.coderbot.iris.shaderpack.PackDirectives;
|
||||
@@ -33,7 +35,6 @@ import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.culling.Frustrum;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
@@ -52,16 +53,9 @@ import org.lwjgl.opengl.GL13;
|
||||
import org.lwjgl.opengl.GL14;
|
||||
import org.lwjgl.opengl.GL30;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class ShadowRenderer {
|
||||
public static final Matrix4f MODELVIEW = new Matrix4f();
|
||||
public static FloatBuffer MODELVIEW_BUFFER = BufferUtils.createFloatBuffer(16);
|
||||
public static final FloatBuffer MODELVIEW_BUFFER = BufferUtils.createFloatBuffer(16);
|
||||
public static final Matrix4f PROJECTION = new Matrix4f();
|
||||
public static List<TileEntity> visibleTileEntities;
|
||||
public static boolean ACTIVE = false;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package net.coderbot.iris.rendertarget;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.lwjgl.MemoryStack;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import lombok.Getter;
|
||||
@@ -40,11 +41,13 @@ public class RenderTarget {
|
||||
this.width = builder.width;
|
||||
this.height = builder.height;
|
||||
|
||||
IntBuffer textures = BufferUtils.createIntBuffer(2);
|
||||
GL11.glGenTextures(textures);
|
||||
try (MemoryStack stack = MemoryStack.stackPush()) {
|
||||
IntBuffer textures = stack.mallocInt(2);
|
||||
GL11.glGenTextures(textures);
|
||||
|
||||
this.mainTexture = textures.get(0);
|
||||
this.altTexture = textures.get(1);
|
||||
this.mainTexture = textures.get(0);
|
||||
this.altTexture = textures.get(1);
|
||||
}
|
||||
|
||||
boolean isPixelFormatInteger = builder.internalFormat.getPixelFormat().isInteger();
|
||||
setupTexture(mainTexture, builder.width, builder.height, !isPixelFormatInteger);
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package net.coderbot.iris.sodium.shader_overrides;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.lwjgl.MemoryStack;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import java.nio.FloatBuffer;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkProgram;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkShaderFogComponent;
|
||||
@@ -11,9 +13,6 @@ import net.coderbot.iris.gl.program.ProgramUniforms;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.joml.Matrix4f;
|
||||
import org.lwjgl.BufferUtils;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
public class IrisChunkProgram extends ChunkProgram {
|
||||
// Uniform variable binding indexes
|
||||
@@ -87,10 +86,12 @@ public class IrisChunkProgram extends ChunkProgram {
|
||||
return;
|
||||
}
|
||||
|
||||
FloatBuffer buffer = BufferUtils.createFloatBuffer(16);
|
||||
try (MemoryStack stack = MemoryStack.stackPush()) {
|
||||
FloatBuffer buffer = stack.mallocFloat(16);
|
||||
|
||||
matrix.get(buffer);
|
||||
matrix.get(buffer);
|
||||
|
||||
RenderSystem.uniformMatrix4fv(location, false, buffer);
|
||||
RenderSystem.uniformMatrix4fv(location, false, buffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user