studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opengl fixes
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-09-01 20:10:33 -04:00
parent 2fbcd250b6
commit 467c42bfe8
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/electrosphere/renderer/model/Mesh.java
View File

@ -500,17 +500,23 @@ public class Mesh {
if(renderPipelineState.getInstanced()){ if(renderPipelineState.getInstanced()){
if(elementCount > 0 ){
GL45.glDrawElementsInstanced(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0, renderPipelineState.getInstanceCount()); GL45.glDrawElementsInstanced(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0, renderPipelineState.getInstanceCount());
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
}
} else { } else {
if(useElementArray){ if(useElementArray){
if(elementCount > 0){
GL11.glDrawElements(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0); GL11.glDrawElements(GL_TRIANGLES, elementCount, GL_UNSIGNED_INT, 0);
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
}
} else { } else {
if(elementCount > 0){
GL11.glDrawArrays(GL_TRIANGLES, 0, elementCount); GL11.glDrawArrays(GL_TRIANGLES, 0, elementCount);
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} }
} }
}
glBindVertexArray(0); glBindVertexArray(0);
Globals.renderingEngine.checkError(); Globals.renderingEngine.checkError();
} }

1
src/test/java/electrosphere/util/ds/OctreeTests.java
View File

@ -11,7 +11,6 @@ import java.util.List;
import java.util.Random; import java.util.Random;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.junit.jupiter.api.Test;
import annotations.BigDataTest; import annotations.BigDataTest;
import annotations.FastTest; import annotations.FastTest;