diff --git a/src/duskgl/display/shader/shadergl.c b/src/duskgl/display/shader/shadergl.c index 933321e..945712d 100644 --- a/src/duskgl/display/shader/shadergl.c +++ b/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) { diff --git a/src/duskgl/display/texture/texturegl.c b/src/duskgl/display/texture/texturegl.c index b23f49e..70675d3 100644 --- a/src/duskgl/display/texture/texturegl.c +++ b/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_RGBA, GL_UNSIGNED_BYTE, (void*)data.rgbaColors + GL_TEXTURE_2D, 0, format, width, height, 0, + 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());