YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed text on PSP

Browse Source
This commit is contained in:
Dominic Masters
2026-03-29 14:45:40 -05:00
parent 26fafab47a
commit 314a2de41a
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/targets/linux.cmake
View File

@@ -28,7 +28,7 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
DUSK_SDL2 DUSK_SDL2
DUSK_OPENGL DUSK_OPENGL
# DUSK_OPENGL_LEGACY DUSK_OPENGL_LEGACY
DUSK_LINUX DUSK_LINUX
DUSK_DISPLAY_SIZE_DYNAMIC DUSK_DISPLAY_SIZE_DYNAMIC
DUSK_DISPLAY_WIDTH_DEFAULT=640 DUSK_DISPLAY_WIDTH_DEFAULT=640

2
src/dusk/display/text/text.c
View File

@@ -73,7 +73,7 @@ errorret_t textDraw(
float_t posX = x; float_t posX = x;
float_t posY = y; float_t posY = y;
// errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture)); errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture));
char_t c; char_t c;
int32_t i = 0; int32_t i = 0;

26
src/duskgl/display/displaygl.c
View File

@@ -11,19 +11,16 @@ errorret_t displayOpenGLInit(void) {
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
errorChain(errorGLCheck()); errorChain(errorGLCheck());
#if DUSK_OPENGL_LEGACY glEnable(GL_TEXTURE_2D);
glDisable(GL_LIGHTING);// PSP defaults this on?
errorChain(errorGLCheck()); errorChain(errorGLCheck());
glShadeModel(GL_SMOOTH); // Fixes color on PSP? glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
errorChain(errorGLCheck());
#endif
glEnable(GL_DEPTH_TEST);
errorChain(errorGLCheck());
glDepthFunc(GL_LEQUAL);
errorChain(errorGLCheck());
glClearDepth(1.0f);
errorChain(errorGLCheck()); errorChain(errorGLCheck());
// glEnable(GL_DEPTH_TEST);
// errorChain(errorGLCheck());
// glDepthFunc(GL_LEQUAL);
// errorChain(errorGLCheck());
// glClearDepth(1.0f);
// errorChain(errorGLCheck());
glEnable(GL_BLEND); glEnable(GL_BLEND);
errorChain(errorGLCheck()); errorChain(errorGLCheck());
@@ -32,5 +29,12 @@ errorret_t displayOpenGLInit(void) {
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
errorChain(errorGLCheck()); 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(); errorOk();
} }