Attempting to fix PSP alpha textures

src/dusk/display/display.c

@@ -30,6 +30,11 @@ errorret_t displayInit(void) {
   #ifdef displayPlatformInit
     errorChain(displayPlatformInit());
   #endif
+  errorChain(quadInit());
+  errorChain(frameBufferInitBackBuffer());
+  errorChain(spriteBatchInit());
+  errorChain(textInit());
+  errorChain(screenInit());
 
   // Setup initial shader with default values
   errorChain(shaderInit(&SHADER_UNLIT, &SHADER_UNLIT_DEFINITION));
@@ -45,11 +50,6 @@ errorret_t displayInit(void) {
   errorChain(shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_MODEL, mat));
   errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, NULL));
 
-  errorChain(quadInit());
-  errorChain(frameBufferInitBackBuffer());
-  errorChain(spriteBatchInit());
-  errorChain(textInit());
-  errorChain(screenInit());
 
   errorOk();
 }

src/dusk/display/text/text.c

@@ -47,7 +47,6 @@ errorret_t textDrawChar(
   vec4 uv;
   tilesetTileGetUV(tileset, tileIndex, uv);
 
-  errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture));
 
   errorChain(spriteBatchPush(
     // texture,
@@ -74,6 +73,8 @@ errorret_t textDraw(
   float_t posX = x;
   float_t posY = y;
 
+  // errorChain(shaderSetTexture(&SHADER_UNLIT, SHADER_UNLIT_TEXTURE, texture));
+
   char_t c;
   int32_t i = 0;
   while((c = text[i++]) != '\0') {

src/duskgl/display/shader/shadergl.c

@@ -232,6 +232,8 @@ errorret_t shaderSetTextureGL(
     errorChain(errorGLCheck());
     glBindTexture(GL_TEXTURE_2D, texture->id);
     errorChain(errorGLCheck());
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    errorChain(errorGLCheck());
 
   #else
     if(shader->setTexture == NULL) {

src/duskgl/display/texture/texturegl.c

@@ -25,8 +25,8 @@ errorret_t textureInitGL(
   switch(format) {
     case TEXTURE_FORMAT_RGBA:
       glTexImage2D(
-        GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
+        GL_TEXTURE_2D, 0, format, width, height, 0,
-        GL_RGBA, GL_UNSIGNED_BYTE, (void*)data.rgbaColors
+        format, GL_UNSIGNED_BYTE, (void*)data.rgbaColors
       );
       errorChain(errorGLCheck());
       break;
@@ -77,10 +77,6 @@ errorret_t textureInitGL(
   errorChain(errorGLCheck());
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
   errorChain(errorGLCheck());
-
-  #ifdef DUSK_OPENGL_LEGACY
-    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-  #endif
   
   glBindTexture(GL_TEXTURE_2D, 0);
   errorChain(errorGLCheck());