From 90fa63f91c816f303ab1517e70c08ea3b8e52469 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 12 Jan 2022 22:25:41 +0100 Subject: [PATCH] Removed support for supplying a separate format than internalFormat when creating OpenGL textures. --- es-core/src/renderers/Renderer_GL21.cpp | 10 +++------- es-core/src/renderers/Renderer_GLES10.cpp | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/es-core/src/renderers/Renderer_GL21.cpp b/es-core/src/renderers/Renderer_GL21.cpp index 95de8e15a..d755b050c 100644 --- a/es-core/src/renderers/Renderer_GL21.cpp +++ b/es-core/src/renderers/Renderer_GL21.cpp @@ -168,7 +168,7 @@ namespace Renderer } unsigned int createTexture(const Texture::Type type, - const Texture::Type format, + const Texture::Type format, // Not used for desktop OpenGL. const bool linearMinify, const bool linearMagnify, const bool repeat, @@ -177,7 +177,6 @@ namespace Renderer void* data) { const GLenum textureType = convertTextureType(type); - const GLenum textureFormat = convertTextureType(format); unsigned int texture; GL_CHECK_ERROR(glGenTextures(1, &texture)); @@ -195,11 +194,8 @@ namespace Renderer GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linearMagnify ? static_cast(GL_LINEAR) : static_cast(GL_NEAREST))); - // Setting different values for internalFormat and format is not really supported by the - // OpenGL standard so hopefully it works with all drivers and on all operating systems. - // This is only intended as a last resort anyway, normally the BGRA_TO_RGBA shader should - // be used for color model conversion. - GL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, textureType, width, height, 0, textureFormat, + + GL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, textureType, width, height, 0, textureType, GL_UNSIGNED_BYTE, data)); return texture; diff --git a/es-core/src/renderers/Renderer_GLES10.cpp b/es-core/src/renderers/Renderer_GLES10.cpp index 596a966ab..86210ee47 100644 --- a/es-core/src/renderers/Renderer_GLES10.cpp +++ b/es-core/src/renderers/Renderer_GLES10.cpp @@ -44,7 +44,6 @@ namespace Renderer // clang-format off switch (_type) { case Texture::RGBA: { return GL_RGBA; } break; - case Texture::BGRA: { return GL_BGRA_EXT; } break; case Texture::ALPHA: { return GL_ALPHA; } break; default: { return GL_ZERO; } } @@ -122,12 +121,24 @@ namespace Renderer void* data) { const GLenum textureType = convertTextureType(type); - const GLenum textureFormat = convertTextureType(format); unsigned int texture; GL_CHECK_ERROR(glGenTextures(1, &texture)); GL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture)); + // Not sure why the corresponding variables are missing in the OpenGL ES include files + // when specifying the values manually seems to work with all graphics drivers. + int _GL_TEXTURE_SWIZZLE_R{0x8E42}; + int _GL_TEXTURE_SWIZZLE_B{0x8E44}; + int _GL_RED{0x1903}; + int _GL_BLUE{0x1905}; + + // Convert from BGRA to RGBA. + if (format == Texture::Type::BGRA) { + glTexParameteri(GL_TEXTURE_2D, _GL_TEXTURE_SWIZZLE_B, _GL_RED); + glTexParameteri(GL_TEXTURE_2D, _GL_TEXTURE_SWIZZLE_R, _GL_BLUE); + } + GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE)); GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, @@ -137,11 +148,7 @@ namespace Renderer GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linearMagnify ? GL_LINEAR : GL_NEAREST)); - // Setting different values for internalFormat and format is not really supported by the - // OpenGL standard so hopefully it works with all drivers and on all operating systems. - // This is only intended as a last resort anyway, normally the BGRA_TO_RGBA shader should - // be used for color model conversion. - GL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, textureType, width, height, 0, textureFormat, + GL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, textureType, width, height, 0, textureType, GL_UNSIGNED_BYTE, data)); return texture;