GRAPHICS: Use RGBA for all textures [OpenGLS]

This commit is contained in:
Dries Harnie 2013-11-19 23:25:54 +01:00
parent 2c936f0334
commit 00e72387e0
2 changed files with 3 additions and 4 deletions

View File

@ -561,7 +561,6 @@ void GfxOpenGLS::drawModelFace(const Mesh *mesh, const MeshFace *face) {
}
void GfxOpenGLS::drawSprite(const Sprite *sprite) {
return;
glDisable(GL_DEPTH_TEST);
_spriteProgram->use();
@ -674,10 +673,10 @@ void GfxOpenGLS::createMaterial(Texture *material, const char *data, const CMap
} else { // The only other colorFormat we load right now is BGR
#ifdef USE_GLES2
format = GL_RGB;
internalFormat = GL_RGB;
internalFormat = GL_RGBA;
#else
format = GL_BGR;
internalFormat = GL_RGB;
internalFormat = GL_RGBA;
#endif
}

View File

@ -15,6 +15,6 @@ void main()
#ifdef GL_ES
texColor.rgba = texColor.bgra;
#endif
outColor.rgb *= texColor.rgb;
outColor.rgba *= texColor.rgba;
}
}