Merge remote-tracking branch 'upstream/master'

.gitlab-ci.yml

@@ -11,11 +11,11 @@ build:sh4-gcc:
     - cd builddir
     - cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/Dreamcast.cmake -DCMAKE_BUILD_TYPE=Release ..
     - make
-    - tar -zcf gldc.tar.gz libGLdc.a ../LICENSE ../README.md ../include
+    - tar -zcf gldc.tar.gz libGL.a ../LICENSE ../README.md ../include
   artifacts:
     paths:
     - builddir/gldc.tar.gz
-    
+
 build:x86-gcc:
   stage: build
   image: fedora:38
@@ -29,7 +29,7 @@ build:x86-gcc:
   artifacts:
     paths:
     - builddir/tests/gldc_tests
-    
+
 test:x86-gcc:
   stage: test
   image: fedora:38

CMakeLists.txt

@@ -109,14 +109,14 @@ else()
     )
 endif()
 
-add_library(GLdc STATIC ${SOURCES})
+add_library(GL STATIC ${SOURCES})
 
 if(FLTO_SUPPORTED)
-    set_property(TARGET GLdc PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+    set_property(TARGET GL PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
 if(NOT PLATFORM_DREAMCAST)
-set_target_properties(GLdc PROPERTIES
+set_target_properties(GL PROPERTIES
     COMPILE_OPTIONS "-m32"
     LINK_OPTIONS "-m32"
 )
@@ -126,7 +126,7 @@ link_libraries(m)
 
 include_directories(include)
 
-link_libraries(GLdc)
+link_libraries(GL)
 
 function(gen_sample sample)
     set(SAMPLE_SRCS ${ARGN})

GL/texture.c

@@ -935,7 +935,7 @@ static GLint _cleanInternalFormat(GLint internalFormat) {
     /* Paletted textures are always twiddled.. otherwise they don't work! */
     case GL_COLOR_INDEX4_EXT:
         return GL_COLOR_INDEX4_TWID_KOS;
-    case GL_COLOR_INDEX8_EXT:        
+    case GL_COLOR_INDEX8_EXT:
         return GL_COLOR_INDEX8_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},
         {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, 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_BYTE, false, false},
@@ -1623,7 +1624,7 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
                     dst = conversionBuffer + (destStride * newLocation);
 
                     for(int j = 0; j < destStride; ++j)
-                        *dst++ = *src++;
+                        *dst++ = *(src + j);
 
                     src += sourceStride;
                 }

tests/CMakeLists.txt

@@ -14,7 +14,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 add_executable(gldc_tests ${TEST_FILES} ${TEST_SOURCES} ${TEST_MAIN_FILENAME})
-target_link_libraries(gldc_tests GLdc)
+target_link_libraries(gldc_tests GL)
 
 if(NOT PLATFORM_DREAMCAST)
 set_target_properties(