wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GL error logging

Browse Source
This commit is contained in:
James Seibel
2025-03-14 10:17:52 -05:00
parent 7b5b8da0d2
commit 0cf5e6d594
9 changed files with 639 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/tests/GLMessageTest.java
+46 -22
View File
@@ -19,7 +19,7 @@
package tests;
import com.seibel.distanthorizons.core.util.objects.GLMessage;
import com.seibel.distanthorizons.core.util.objects.GLMessages.*;
import org.junit.Assert;
import org.junit.Test;
@@ -28,66 +28,88 @@ import java.util.ArrayList;
public class GLMessageTest
{
public static final String MESSAGE_ID = "0x20071";
public static final GLMessage.ESource MESSAGE_SOURCE = GLMessage.ESource.API;
public static final GLMessage.EType MESSAGE_TYPE = GLMessage.EType.OTHER;
public static final GLMessage.ESeverity MESSAGE_SEVERITY = GLMessage.ESeverity.NOTIFICATION;
public static final EGLMessageSource MESSAGE_SOURCE = EGLMessageSource.API;
public static final EGLMessageType MESSAGE_TYPE = EGLMessageType.OTHER;
public static final EGLMessageSeverity MESSAGE_SEVERITY = EGLMessageSeverity.NOTIFICATION;
public static final String MESSAGE = "Buffer detailed info: Buffer object 1014084 (bound to GL_ARRAY_BUFFER_ARB, usage hint is GL_STATIC_DRAW) will use VIDEO memory as\" \"the source for buffer object operations.";
/** This is how debug messages were sent prior to Minecraft 1.20.2 */
private static final String[] PRE_1_20_2_MESSAGE_ARRAY =
private static final String[] OLD_MESSAGE_ARRAY =
{
"[LWJGL] OpenGL debug message"
,"ID", ":", "0x20071"
,"Source", ":", "API"
,"Type", ":", "OTHER"
,"Severity", ":", "NOTIFICATION"
,"Message", ":", "Buffer detailed info: Buffer object 1014084 (bound to GL_ARRAY_BUFFER_ARB, usage hint is GL_STATIC_DRAW) will use VIDEO memory as\" \"the source for buffer object operations."
,"ID", ":", MESSAGE_ID
,"Source", ":", MESSAGE_SOURCE.name
,"Type", ":", MESSAGE_TYPE.name
,"Severity", ":", MESSAGE_SEVERITY.name
,"Message", ":", MESSAGE
// optional addition to force the builder into noticing the message ended, shouldn't be necessary
//,"[LWJGL] OpenGL debug message"
};
/** This is how debug messages were sent after (and including) Minecraft 1.20.2 */
private static final String[] POST_1_20_2_MESSAGE_ARRAY =
private static final String[] NEW_MESSAGE_ARRAY =
{
"[LWJGL] OpenGL debug message"
,"ID: 0x20071"
,"Source: API"
,"Type: OTHER"
,"Severity: NOTIFICATION"
,"Message: Buffer detailed info: Buffer object 1014084 (bound to GL_ARRAY_BUFFER_ARB, usage hint is GL_STATIC_DRAW) will use VIDEO memory as\" \"the source for buffer object operations."
,"ID: " + MESSAGE_ID
,"Source: " + MESSAGE_SOURCE.name
,"Type: " + MESSAGE_TYPE.name
,"Severity: " + MESSAGE_SEVERITY.name
,"Message: " + MESSAGE
// optional addition to force the builder into noticing the message ended, shouldn't be necessary
//,"[LWJGL] OpenGL debug message"
};
public final GLMessageBuilder messageBuilder = new GLMessageBuilder(null, null, null);
//=======//
// tests //
//=======//
@Test
public void preMc1_20_2()
{
ArrayList<GLMessage> messageList = new ArrayList<>();
for (String str : PRE_1_20_2_MESSAGE_ARRAY)
for (String str : OLD_MESSAGE_ARRAY)
{
GLMessage message = GLMessage.Builder.DEFAULT_MESSAGE_BUILDER.add(str);
GLMessage message = this.messageBuilder.add(str);
if (message != null)
{
messageList.add(message);
}
}
//Assert.assertEquals("Incorrect message parse count.", 1, messageList.size());
//testMessage(messageList.get(0));
Assert.assertEquals("Incorrect message parse count.", 1, messageList.size());
messageMatchesExpected(messageList.get(0));
}
@Test
public void mc1_20_2()
{
// TODO
ArrayList<GLMessage> messageList = new ArrayList<>();
for (String str : NEW_MESSAGE_ARRAY)
{
GLMessage message = this.messageBuilder.add(str);
if (message != null)
{
messageList.add(message);
}
}
Assert.assertEquals("Incorrect message parse count.", 1, messageList.size());
messageMatchesExpected(messageList.get(0));
}
//================//
// helper methods //
//================//
private static void messageMatchesExpected(GLMessage testMessage)
{
Assert.assertEquals(MESSAGE_ID, testMessage.id);
@@ -97,4 +119,6 @@ public class GLMessageTest
Assert.assertEquals(MESSAGE, testMessage.message);
}
}