From 314a2de41a6e5620a61dba5ba089c68cad15ad98 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sun, 29 Mar 2026 14:45:40 -0500 Subject: [PATCH] Fixed text on PSP --- cmake/targets/linux.cmake | 2 +- src/dusk/display/text/text.c | 2 +- src/duskgl/display/displaygl.c | 26 +++++++++++++++----------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/cmake/targets/linux.cmake b/cmake/targets/linux.cmake index 4072358..e83e87a 100644 --- a/cmake/targets/linux.cmake +++ b/cmake/targets/linux.cmake @@ -28,7 +28,7 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC DUSK_SDL2 DUSK_OPENGL - # DUSK_OPENGL_LEGACY + DUSK_OPENGL_LEGACY DUSK_LINUX DUSK_DISPLAY_SIZE_DYNAMIC DUSK_DISPLAY_WIDTH_DEFAULT=640 diff --git a/src/dusk/display/text/text.c b/src/dusk/display/text/text.c index 873ef3c..f951365 100644 --- a/src/dusk/display/text/text.c +++ b/src/dusk/display/text/text.c @@ -73,7 +73,7 @@ errorret_t textDraw( float_t posX = x; float_t posY = y; - // errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture)); + errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture)); char_t c; int32_t i = 0; diff --git a/src/duskgl/display/displaygl.c b/src/duskgl/display/displaygl.c index ad67599..07d2916 100644 --- a/src/duskgl/display/displaygl.c +++ b/src/duskgl/display/displaygl.c @@ -11,19 +11,16 @@ errorret_t displayOpenGLInit(void) { glDisable(GL_CULL_FACE); errorChain(errorGLCheck()); - #if DUSK_OPENGL_LEGACY - glDisable(GL_LIGHTING);// PSP defaults this on? - errorChain(errorGLCheck()); - glShadeModel(GL_SMOOTH); // Fixes color on PSP? - errorChain(errorGLCheck()); - #endif - - glEnable(GL_DEPTH_TEST); + glEnable(GL_TEXTURE_2D); errorChain(errorGLCheck()); - glDepthFunc(GL_LEQUAL); - errorChain(errorGLCheck()); - glClearDepth(1.0f); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); errorChain(errorGLCheck()); + // glEnable(GL_DEPTH_TEST); + // errorChain(errorGLCheck()); + // glDepthFunc(GL_LEQUAL); + // errorChain(errorGLCheck()); + // glClearDepth(1.0f); + // errorChain(errorGLCheck()); glEnable(GL_BLEND); errorChain(errorGLCheck()); @@ -32,5 +29,12 @@ errorret_t displayOpenGLInit(void) { glPixelStorei(GL_UNPACK_ALIGNMENT, 1); errorChain(errorGLCheck()); + #if DUSK_OPENGL_LEGACY + glDisable(GL_LIGHTING);// PSP defaults this on? + errorChain(errorGLCheck()); + glShadeModel(GL_SMOOTH); // Fixes color on PSP? + errorChain(errorGLCheck()); + #endif + errorOk(); } \ No newline at end of file