Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed support for supplying a separate format than internalFormat when creating OpenGL textures.

Browse source
This commit is contained in:
Leon Styhre 2022-01-12 22:25:41 +01:00
parent 750ee07351
commit 90fa63f91c
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
es-core/src/renderers/Renderer_GL21.cpp
View file

@ -168,7 +168,7 @@ namespace Renderer
} }
unsigned int createTexture(const Texture::Type type, 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 linearMinify,
const bool linearMagnify, const bool linearMagnify,
const bool repeat, const bool repeat,
@ -177,7 +177,6 @@ namespace Renderer
void* data) void* data)
{ {
const GLenum textureType = convertTextureType(type); const GLenum textureType = convertTextureType(type);
const GLenum textureFormat = convertTextureType(format);
unsigned int texture; unsigned int texture;
GL_CHECK_ERROR(glGenTextures(1, &texture)); GL_CHECK_ERROR(glGenTextures(1, &texture));
@ -195,11 +194,8 @@ namespace Renderer
GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
linearMagnify ? static_cast<GLfloat>(GL_LINEAR) : linearMagnify ? static_cast<GLfloat>(GL_LINEAR) :
static_cast<GLfloat>(GL_NEAREST))); static_cast<GLfloat>(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. GL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, textureType, width, height, 0, textureType,
// 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_UNSIGNED_BYTE, data)); GL_UNSIGNED_BYTE, data));
return texture; return texture;

21
es-core/src/renderers/Renderer_GLES10.cpp
View file

@ -44,7 +44,6 @@ namespace Renderer
// clang-format off // clang-format off
switch (_type) { switch (_type) {
case Texture::RGBA: { return GL_RGBA; } break; case Texture::RGBA: { return GL_RGBA; } break;
case Texture::BGRA: { return GL_BGRA_EXT; } break;
case Texture::ALPHA: { return GL_ALPHA; } break; case Texture::ALPHA: { return GL_ALPHA; } break;
default: { return GL_ZERO; } default: { return GL_ZERO; }
} }
@ -122,12 +121,24 @@ namespace Renderer
void* data) void* data)
{ {
const GLenum textureType = convertTextureType(type); const GLenum textureType = convertTextureType(type);
const GLenum textureFormat = convertTextureType(format);
unsigned int texture; unsigned int texture;
GL_CHECK_ERROR(glGenTextures(1, &texture)); GL_CHECK_ERROR(glGenTextures(1, &texture));
GL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, 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, GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE)); repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE));
GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, 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, GL_CHECK_ERROR(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
linearMagnify ? GL_LINEAR : GL_NEAREST)); linearMagnify ? GL_LINEAR : GL_NEAREST));
// Setting different values for internalFormat and format is not really supported by the GL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, textureType, width, height, 0, textureType,
// 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_UNSIGNED_BYTE, data)); GL_UNSIGNED_BYTE, data));
return texture; return texture;