ecker/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue with texture twiddling and RGB565 untwiddled textures

Browse Source
This commit is contained in:
Luke Benstead 2023-11-29 11:25:32 +00:00
parent 0efe4c6cef
commit 2b3c083de3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GL/texture.c
View File

@ -935,7 +935,7 @@ static GLint _cleanInternalFormat(GLint internalFormat) {
/* Paletted textures are always twiddled.. otherwise they don't work! */ /* Paletted textures are always twiddled.. otherwise they don't work! */
case GL_COLOR_INDEX4_EXT: case GL_COLOR_INDEX4_EXT:
return GL_COLOR_INDEX4_TWID_KOS; return GL_COLOR_INDEX4_TWID_KOS;
case GL_COLOR_INDEX8_EXT: case GL_COLOR_INDEX8_EXT:
return GL_COLOR_INDEX8_TWID_KOS; return GL_COLOR_INDEX8_TWID_KOS;
case GL_RGB_TWID_KOS: case GL_RGB_TWID_KOS:
@ -1223,6 +1223,7 @@ static int _determineConversion(GLint internalFormat, GLenum format, GLenum type
{_r8_to_rgb565, GL_RGB565_KOS, GL_RED, GL_UNSIGNED_BYTE, false, false}, {_r8_to_rgb565, GL_RGB565_KOS, GL_RED, GL_UNSIGNED_BYTE, false, false},
{NULL, GL_RGB565_KOS, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, false, false}, {NULL, GL_RGB565_KOS, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, false, false},
{NULL, GL_RGB565_TWID_KOS, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_TWID_KOS, false, false}, {NULL, GL_RGB565_TWID_KOS, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_TWID_KOS, false, false},
{NULL, GL_RGB565_TWID_KOS, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, true, false},
{_rgb888_to_rgb565, GL_RGB565_TWID_KOS, GL_RGB, GL_UNSIGNED_BYTE, true, false}, {_rgb888_to_rgb565, GL_RGB565_TWID_KOS, GL_RGB, GL_UNSIGNED_BYTE, true, false},
{NULL, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, false, false}, {NULL, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, false, false},
{NULL, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX, GL_BYTE, false, false}, {NULL, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX, GL_BYTE, false, false},
@ -1623,7 +1624,7 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
dst = conversionBuffer + (destStride * newLocation); dst = conversionBuffer + (destStride * newLocation);
for(int j = 0; j < destStride; ++j) for(int j = 0; j < destStride; ++j)
*dst++ = *src++; *dst++ = *(src + j);
src += sourceStride; src += sourceStride;
} }