mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 20:09:39 +00:00
GLSM Tests & AMD Driver Workaround (#290)
* Store graphics vendor * AMD driver workarounds * Test TRANSFORM_BIT * Test GL_TEXTURE_BIT * Fix handling of bound textures on glDeleteTextures * Switch up the LOGGER in RenderSystem so we don't trigger a Forge Configuration load; AMD driver default matrix mode workaround * Switch BatchingFontRenderer to use the gl methods via GLSM to better respect cache bypassing Fix a few instances of GLSM not respecting the bypass * Start with "runningSplash" true always to disable the cache until loaded into the world --------- Co-authored-by: Caedis <[email protected]>
This commit is contained in:
1 parent
d1e505308c
commit
ff290c19e2
11 files changed
+203
-50
No files matched your search
@@ -1,7 +1,7 @@
|
||||
package com.gtnewhorizons.angelica;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import org.junit.jupiter.api.extension.AfterAllCallback;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import org.junit.jupiter.api.extension.AfterEachCallback;
|
||||
import org.junit.jupiter.api.extension.BeforeAllCallback;
|
||||
import org.junit.jupiter.api.extension.ExtensionContext;
|
||||
@@ -22,11 +22,6 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback,
|
||||
public static String glRenderer;
|
||||
public static String glVersion;
|
||||
|
||||
public static boolean NVIDIA;
|
||||
public static boolean AMD;
|
||||
public static boolean INTEL;
|
||||
public static boolean MESA;
|
||||
|
||||
@Override
|
||||
public void beforeAll(ExtensionContext context) throws LWJGLException {
|
||||
if (!started) {
|
||||
@@ -41,6 +36,9 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback,
|
||||
|
||||
// Warm-up State Manager features
|
||||
GLStateManager.preInit();
|
||||
GLStateManager.setRunningSplash(false); // So we don't bypass the cache
|
||||
GLStateManager.BYPASS_CACHE = false; // Just to be sure
|
||||
RenderSystem.initRenderer();
|
||||
context.getRoot().getStore(GLOBAL).put("AngelicaExtension", this);
|
||||
glVendor = GL11.glGetString(GL11.GL_VENDOR);
|
||||
glRenderer = GL11.glGetString(GL11.GL_RENDERER);
|
||||
@@ -49,11 +47,6 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback,
|
||||
System.out.println("OpenGL Vendor: " + glVendor);
|
||||
System.out.println("OpenGL Renderer: " + glRenderer);
|
||||
System.out.println("OpenGL Version: " + glVersion);
|
||||
|
||||
NVIDIA = glVendor.toLowerCase().contains("nvidia");
|
||||
AMD = glVendor.toLowerCase().contains("ati") || glVendor.toLowerCase().contains("amd");
|
||||
INTEL = glVendor.toLowerCase().contains("intel");
|
||||
MESA = glVendor.toLowerCase().contains("mesa");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ class GLSM_PushPop_UnitTest {
|
||||
bits.add(new GLBit(GL11.GL_DITHER, "Dither", true));
|
||||
bits.add(new GLBit(GL11.GL_FOG, "Fog", false));
|
||||
// This fails on the RESET test in xvfb
|
||||
if(!(AngelicaExtension.MESA || AngelicaExtension.AMD)) {
|
||||
if(!(GLStateManager.MESA || GLStateManager.AMD)) {
|
||||
for(i = 0 ; i < GL11.glGetInteger(GL11.GL_MAX_LIGHTS) ; i++) {
|
||||
bits.add(new GLBit(GL11.GL_LIGHT0 + i, "Light " + i, false));
|
||||
}
|
||||
@@ -236,7 +236,7 @@ class GLSM_PushPop_UnitTest {
|
||||
bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_3, "Map2 Texture Coord 3", false));
|
||||
bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_4, "Map2 Texture Coord 4", false));
|
||||
// Seems to be broken at least on Nvidia
|
||||
if(!AngelicaExtension.NVIDIA) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true));
|
||||
if(!GLStateManager.NVIDIA) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true));
|
||||
bits.add(new GLBit(GL11.GL_NORMALIZE, "Normalize", false));
|
||||
bits.add(new GLBit(GL11.GL_POINT_SMOOTH, "Point Smooth", false));
|
||||
bits.add(new GLBit(GL11.GL_POLYGON_OFFSET_LINE, "Polygon Offset Line", false));
|
||||
@@ -285,7 +285,7 @@ class GLSM_PushPop_UnitTest {
|
||||
GLStateManager.glFogf(GL11.GL_FOG_END, 0.5f);
|
||||
GLStateManager.glFogf(GL11.GL_FOG_START, 0.5f);
|
||||
GLStateManager.glFogf(GL11.GL_FOG_MODE, GL11.GL_LINEAR);
|
||||
if(!AngelicaExtension.NVIDIA) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f);
|
||||
if(!GLStateManager.NVIDIA) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f);
|
||||
|
||||
verifyIsEnabled(GL11.GL_FOG, true, "Fog Enable");
|
||||
verifyState(GL11.GL_FOG_COLOR, FLOAT_ARRAY_4_POINT_5, "Fog Color");
|
||||
@@ -293,7 +293,7 @@ class GLSM_PushPop_UnitTest {
|
||||
verifyState(GL11.GL_FOG_END, 0.5f, "Fog End");
|
||||
verifyState(GL11.GL_FOG_START, 0.5f, "Fog Start");
|
||||
verifyState(GL11.GL_FOG_MODE, GL11.GL_LINEAR, "Fog Mode");
|
||||
if(!AngelicaExtension.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index");
|
||||
if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index");
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyIsEnabled(GL11.GL_FOG, false, "Fog Enable - Reset");
|
||||
@@ -302,7 +302,7 @@ class GLSM_PushPop_UnitTest {
|
||||
verifyState(GL11.GL_FOG_END, 1f, "Fog End - Reset");
|
||||
verifyState(GL11.GL_FOG_START, 0f, "Fog Start - Reset");
|
||||
verifyState(GL11.GL_FOG_MODE, GL11.GL_EXP, "Fog Mode - Reset");
|
||||
if(!AngelicaExtension.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset");
|
||||
if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -373,8 +373,135 @@ class GLSM_PushPop_UnitTest {
|
||||
verifyState(GL11.GL_SHADE_MODEL, GL11.GL_SMOOTH, "Shade Model - Reset");
|
||||
|
||||
bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State"));
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
void testPushPopTextureBit() {
|
||||
final ArrayList<GLBit> bits = new ArrayList<>();
|
||||
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_S, "Texture Gen S", false));
|
||||
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_T, "Texture Gen T", false));
|
||||
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_R, "Texture Gen R", false));
|
||||
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_Q, "Texture Gen Q", false));
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Initial Active Texture");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Initial Texture Binding");
|
||||
|
||||
final int tex1 = GL11.glGenTextures();
|
||||
final int tex2 = GL11.glGenTextures();
|
||||
|
||||
GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 0");
|
||||
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture");
|
||||
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding - Unit 1 - Switch");
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex2);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex2, "Texture Binding - Unit 1 - Set");
|
||||
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 0");
|
||||
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex2, "Texture Binding - Unit 1");
|
||||
|
||||
bits.forEach(bit -> {
|
||||
verifyState(bit.glEnum(), bit.initial(), bit.name() + " Initial State");
|
||||
if(bit.initial()) {
|
||||
GLStateManager.glDisable(bit.glEnum());
|
||||
} else {
|
||||
GLStateManager.glEnable(bit.glEnum());
|
||||
}
|
||||
verifyState(bit.glEnum(), !bit.initial(), bit.name() + " Toggle State");
|
||||
});
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture Unit 0 - Reset");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Unit 0 - Reset");
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Unit 1 - Reset");
|
||||
|
||||
bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State"));
|
||||
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
|
||||
GLStateManager.glDeleteTextures(tex1);
|
||||
GLStateManager.glDeleteTextures(tex2);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testPushPopTextureBitMultiple() {
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Initial Active Texture");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Initial Texture Binding");
|
||||
|
||||
final int tex1 = GL11.glGenTextures();
|
||||
final int tex2 = GL11.glGenTextures();
|
||||
|
||||
GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1);
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1);
|
||||
|
||||
GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT);
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 1");
|
||||
GLStateManager.glDeleteTextures(tex2);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 1");
|
||||
GLStateManager.glDeleteTextures(tex1);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 1");
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 0");
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture - Reset 1");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding Deleted - Unit 1");
|
||||
GLStateManager.glDeleteTextures(tex1);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 1");
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 0");
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture - Reset 2");
|
||||
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding - Reset 2");
|
||||
}
|
||||
|
||||
@Test
|
||||
void testPushPopTransformBit() {
|
||||
verifyState(GL11.GL_MATRIX_MODE, GL11.GL_MODELVIEW, "Initial Matrix Mode");
|
||||
verifyState(GL11.GL_NORMALIZE, false, "Initial Normalize");
|
||||
verifyState(GL12.GL_RESCALE_NORMAL, false, "Initial Rescale Normal");
|
||||
|
||||
GLStateManager.glPushAttrib(GL11.GL_TRANSFORM_BIT);
|
||||
GLStateManager.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GLStateManager.glEnable(GL11.GL_NORMALIZE);
|
||||
GLStateManager.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
verifyState(GL11.GL_MATRIX_MODE, GL11.GL_PROJECTION, "Matrix Mode");
|
||||
verifyState(GL11.GL_NORMALIZE, true, "Normalize");
|
||||
verifyState(GL12.GL_RESCALE_NORMAL, true, "Rescale Normal");
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyState(GL11.GL_MATRIX_MODE, GL11.GL_MODELVIEW, "Matrix Mode - Reset");
|
||||
verifyState(GL11.GL_NORMALIZE, false, "Normalize - Reset");
|
||||
verifyState(GL12.GL_RESCALE_NORMAL, false, "Rescale Normal - Reset");
|
||||
}
|
||||
|
||||
@Test
|
||||
void testPushPopViewportBit() {
|
||||
GLStateManager.glViewport(0, 0, 800, 600);
|
||||
verifyState(GL11.GL_VIEWPORT, new int[] { 0, 0, 800, 600 }, "Viewport - Initial");
|
||||
verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.0f, 1.0f }, "Depth Range - Initial");
|
||||
|
||||
GLStateManager.glPushAttrib(GL11.GL_VIEWPORT_BIT);
|
||||
GLStateManager.glViewport(1, 1, 100, 100);
|
||||
GLStateManager.glDepthRange(0.5, 1.0);
|
||||
|
||||
verifyState(GL11.GL_VIEWPORT, new int[] { 1, 1, 100, 100 }, "Viewport");
|
||||
verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.5f, 1.0f }, "Depth Range");
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyState(GL11.GL_VIEWPORT, new int[] { 0, 0, 800, 600 }, "Viewport - Reset");
|
||||
verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.0f, 1.0f }, "Depth Range - Reset");
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.stream.IntStream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertAll;
|
||||
@@ -55,6 +56,22 @@ public class GLSMUtil {
|
||||
() -> assertEquals(expected, GLStateManager.glGetFloat(glCap), 0.0001f, "GLSM State Mismatch")
|
||||
);
|
||||
}
|
||||
public static void verifyState(int glCap, int[] expected) {
|
||||
verifyState(glCap, expected, "Int State Mismatch");
|
||||
}
|
||||
|
||||
static final IntBuffer glIntBuffer = BufferUtils.createIntBuffer(16);
|
||||
static final IntBuffer glsmIntBuffer = BufferUtils.createIntBuffer(16);
|
||||
|
||||
public static void verifyState(int glCap, int[] expected, String message) {
|
||||
GL11.glGetInteger(glCap, (IntBuffer) glIntBuffer.clear());
|
||||
GLStateManager.glGetInteger(glCap, (IntBuffer) glsmIntBuffer.clear());
|
||||
IntStream.range (0, expected.length).forEach(i -> assertAll(message,
|
||||
() -> assertEquals(expected[i], glIntBuffer.get(i), "GL State Mismatch: " + i),
|
||||
() -> assertEquals(expected[i], glsmIntBuffer.get(i), "GLSM State Mismatch: " + i)
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
public static void verifyState(int glCap, float[] expected) {
|
||||
verifyState(glCap, expected, "Float State Mismatch");
|
||||
|
||||
Reference in new issue
Block a user