From 8a50ed036d23324893b69ae6abc51caa70a67a16 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 11 Feb 2024 12:13:51 -0800 Subject: [PATCH] More GLSM Tests (#282) * Properly Cache GL_SHADE_MODEL and make it a stack * Add opengl_32_core to docs, so we can easily see what is needed to be deprecated/emulated Add some stub functions to be fleshed out later --- docs/opengl_32_core.xml | 1012 +++++++++++++++++ .../gtnewhorizons/angelica/glsm/Feature.java | 2 +- .../angelica/glsm/GLStateManager.java | 35 +- .../transform/RedirectorTransformer.java | 23 +- .../angelica/glsm/GLSM_PushPop_UnitTest.java | 22 +- 5 files changed, 1070 insertions(+), 24 deletions(-) create mode 100644 docs/opengl_32_core.xml diff --git a/docs/opengl_32_core.xml b/docs/opengl_32_core.xml new file mode 100644 index 000000000..7381cabaf --- /dev/null +++ b/docs/opengl_32_core.xml @@ -0,0 +1,1012 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java b/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java index cc0eb41a7..b1f77ea00 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java @@ -155,7 +155,7 @@ public class Feature { // Ambient, diffuse, specular, and emissive color for each material // Ambient, diffuse, and specular color indices for each material // Specular exponent for each material - // GL_SHADE_MODEL setting + , GLStateManager.shadeModelState // GL_SHADE_MODEL setting )); attribToFeatures.put(GL11.GL_LINE_BIT, ImmutableSet.of( // GL_LINE_SMOOTH flag diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 7e087e756..f1f9e2afc 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -86,8 +86,11 @@ public class GLStateManager { // GLStateManager State Trackers private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH); protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack(); + protected static final IntegerStateStack shadeModelState = new IntegerStateStack(); + static { activeTextureUnit.setValue(0); // GL_TEXTURE0 + shadeModelState.setValue(GL11.GL_SMOOTH); } @Getter protected static final TextureUnitArray textures = new TextureUnitArray(); @Getter protected static final BlendStateStack blendState = new BlendStateStack(); @@ -116,7 +119,6 @@ public class GLStateManager { @Getter protected static final ViewPortStateStack viewportState = new ViewPortStateStack(); - private static int modelShadeMode; // Iris Listeners private static Runnable blendFuncListener = null; @@ -313,6 +315,7 @@ public class GLStateManager { case GL11.GL_DEPTH_FUNC -> depthState.getFunc(); case GL11.GL_LIST_MODE -> glListMode; case GL11.GL_MATRIX_MODE -> matrixMode.getMode(); + case GL11.GL_SHADE_MODEL -> shadeModelState.getValue(); case GL11.GL_TEXTURE_BINDING_2D -> getBoundTexture(); case GL14.GL_BLEND_DST_ALPHA -> blendState.getDstAlpha(); case GL14.GL_BLEND_DST_RGB -> blendState.getDstRgb(); @@ -960,8 +963,8 @@ public class GLStateManager { } public static void glShadeModel(int mode) { - if (shouldBypassCache() || modelShadeMode != mode) { - modelShadeMode = mode; + if (shouldBypassCache() || shadeModelState.getValue() != mode) { + shadeModelState.setValue(mode); GL11.glShadeModel(mode); } } @@ -1349,4 +1352,30 @@ public class GLStateManager { default -> GL11.glGetTexLevelParameteri(target, level, pname); }; } + + public static void glLight(int light, int pname, FloatBuffer params) { + GL11.glLight(light, pname, params); + } + public static void glLight(int light, int pname, IntBuffer params) { + GL11.glLight(light, pname, params); + } + + public static void glLightModel(int pname, FloatBuffer params) { + GL11.glLightModel(pname, params); + } + public static void glLightModel(int pname, IntBuffer params) { + GL11.glLightModel(pname, params); + } + public static void glLightModelf(int pname, float param) { + GL11.glLightModelf(pname, param); + } + public static void glLightModeli(int pname, int param) { + GL11.glLightModeli(pname, param); + } + + public static void glColorMaterial(int face, int mode) { + GL11.glColorMaterial(face, mode); + } + + } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java index 89c9c96a0..fef9d5d8b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java @@ -117,6 +117,7 @@ public class RedirectorTransformer implements IClassTransformer { .add("glColor4f") .add("glColor4ub") .add("glColorMask") + .add("glColorMaterial") .add("glDeleteTextures") .add("glDepthFunc") .add("glDepthMask") @@ -136,6 +137,10 @@ public class RedirectorTransformer implements IClassTransformer { .add("glGetTexParameterf") .add("glGetTexParameteri") .add("glIsEnabled") + .add("glLight") + .add("glLightModel") + .add("glLightModelf") + .add("glLightModeli") .add("glLoadIdentity") .add("glLoadMatrix") .add("glLogicOp") @@ -151,32 +156,32 @@ public class RedirectorTransformer implements IClassTransformer { .add("glPopMatrix") .add("glPushAttrib") .add("glPushMatrix") - .add("glRasterPos2f") .add("glRasterPos2d") + .add("glRasterPos2f") .add("glRasterPos2i") - .add("glRasterPos3f") .add("glRasterPos3d") + .add("glRasterPos3f") .add("glRasterPos3i") - .add("glRasterPos4f") .add("glRasterPos4d") + .add("glRasterPos4f") .add("glRasterPos4i") .add("glRotated") .add("glRotatef") .add("glScaled") .add("glScalef") - .add("glTexCoord1f") + .add("glShadeModel") .add("glTexCoord1d") - .add("glTexCoord2f") + .add("glTexCoord1f") .add("glTexCoord2d") - .add("glTexCoord3f") + .add("glTexCoord2f") .add("glTexCoord3d") - .add("glTexCoord4f") + .add("glTexCoord3f") .add("glTexCoord4d") + .add("glTexCoord4f") + .add("glTexImage2D") .add("glTexParameter") .add("glTexParameterf") .add("glTexParameteri") - .add("glShadeModel") - .add("glTexImage2D") .add("glTexParameteri") .add("glTranslated") .add("glTranslatef") diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java index 3b91a72cc..b589fa5e4 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java @@ -317,22 +317,22 @@ class GLSM_PushPop_UnitTest { } GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glColorMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT); + GLStateManager.glColorMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT); // Ambient scene color ?? - GL11.glLightModelf(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 1f); - GL11.glLightModelf(GL11.GL_LIGHT_MODEL_TWO_SIDE, 1f); + GLStateManager.glLightModelf(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 1f); + GLStateManager.glLightModelf(GL11.GL_LIGHT_MODEL_TWO_SIDE, 1f); floatBuffer.put(FLOAT_ARRAY_4_POINT_5).flip(); - GL11.glLightModel(GL11.GL_LIGHT_MODEL_AMBIENT, floatBuffer); - GL11.glLightModeli(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SEPARATE_SPECULAR_COLOR); - GL11.glLight(GL11.GL_LIGHT0, GL11.GL_AMBIENT, floatBuffer); - GL11.glLight(GL11.GL_LIGHT0, GL11.GL_DIFFUSE, floatBuffer); - GL11.glLight(GL11.GL_LIGHT0, GL11.GL_SPECULAR, floatBuffer); - GL11.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, floatBuffer); + GLStateManager.glLightModel(GL11.GL_LIGHT_MODEL_AMBIENT, floatBuffer); + GLStateManager.glLightModeli(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SEPARATE_SPECULAR_COLOR); + GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_AMBIENT, floatBuffer); + GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_DIFFUSE, floatBuffer); + GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_SPECULAR, floatBuffer); + GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, floatBuffer); floatBuffer.put(FLOAT_ARRAY_4_0010).flip(); - GL11.glLight(GL11.GL_LIGHT0, GL11.GL_SPOT_DIRECTION, floatBuffer); + GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_SPOT_DIRECTION, floatBuffer); floatBuffer.put(FLOAT_ARRAY_4_0).flip(); - GL11.glShadeModel(GL11.GL_FLAT); + GLStateManager.glShadeModel(GL11.GL_FLAT); verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT, "Color Material Face");