Skip to content

Commit

Permalink
Merge pull request #2462 from rhysdh540/multiloader-new
Browse files Browse the repository at this point in the history
fix dh compat on macos
  • Loading branch information
IMS212 committed Sep 7, 2024
2 parents db37a12 + e406a5a commit 3772087
Showing 1 changed file with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.lwjgl.opengl.GL30C;
import org.lwjgl.opengl.GL32;
import org.lwjgl.opengl.GL32C;
import org.lwjgl.opengl.GL43;
import org.lwjgl.opengl.GL43C;
import org.lwjgl.system.MemoryStack;

Expand Down Expand Up @@ -137,10 +136,8 @@ private IrisGenericRenderProgram(String name, boolean isShadowPass, boolean tran

this.va = GlStateManager._glGenVertexArrays();
GlStateManager._glBindVertexArray(va);
GL43.glVertexAttribFormat(0, 3, GL43C.GL_FLOAT,
false, 0); // Here strideSize is new attrib offset
GL43.glVertexAttribBinding(0, 0);
GL43.glEnableVertexAttribArray(0);
GL32.glVertexAttribPointer(0, 3, GL32.GL_FLOAT, false, 0, 0);
GL32.glEnableVertexAttribArray(0);

projectionUniform = tryGetUniformLocation2("iris_ProjectionMatrix");
projectionInverseUniform = tryGetUniformLocation2("iris_ProjectionMatrixInverse");
Expand Down Expand Up @@ -264,7 +261,8 @@ public void unbind() {

@Override
public void bindVertexBuffer(int i) {
GL43.glBindVertexBuffer(0, i, 0, 12);
GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, i);
GL32.glVertexAttribPointer(0, 3, GL32.GL_FLOAT, false, 12, 0);
}

@Override
Expand Down

0 comments on commit 3772087

Please sign in to comment.