ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed skybox rendering.

Browse Source 
The GL_SRGB_ALPHA_EXT and GL_SRGB8_ALPHA8 formats are available in OpenGL ES, but they produce black texture for some reason. The basic GL_RGBA format works fine though.
This commit is contained in:
Deve 2016-06-29 22:24:17 +02:00
parent 961428f04c
commit 3ae175e05a
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/graphics/skybox.cpp
View File

@ -185,22 +185,19 @@ void Skybox::generateCubeMapFromTextures()
} }
glBindTexture(GL_TEXTURE_CUBE_MAP, m_cube_map); glBindTexture(GL_TEXTURE_CUBE_MAP, m_cube_map);
#ifndef ANDROID #if !defined(USE_GLES2) && !defined(ANDROID)
#if !defined(USE_GLES2) GLint internal_format = CVS->isTextureCompressionEnabled() ?
if (CVS->isTextureCompressionEnabled()) GL_COMPRESSED_SRGB_ALPHA : GL_SRGB_ALPHA;
{ #else
glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, // The GL_SRGB_ALPHA_EXT and GL_SRGB8_ALPHA8 formats are available in
GL_COMPRESSED_SRGB_ALPHA, size, size, 0, GL_BGRA, // OpenGL ES, but they produce black texture for some reason.
GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]); // The basic GL_RGBA format works fine though.
} GLint internal_format = GL_RGBA;
else
#endif
{
glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
GL_SRGB_ALPHA, size, size, 0, GL_BGRA,
GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
}
#endif #endif
glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
internal_format, size, size, 0, GL_BGRA,
GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
} }
glGenerateMipmap(GL_TEXTURE_CUBE_MAP); glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
for (unsigned i = 0; i < 6; i++) for (unsigned i = 0; i < 6; i++)