2 Commits a1dde664d1 ... f102ff16a2

Author SHA1 Message Date
  Sam Lantinga f102ff16a2 Don't treat the Keychron K1 Pro System Control keyboard as a joystick 1 week ago
  Ozkan Sezer 50935a9d41 fix sdlgenblit.pl so that it actually matches the generated source 1 week ago
3 changed files with 13 additions and 3 deletions
  1. 1 0
      src/joystick/SDL_joystick.c
  2. 2 1
      src/video/SDL_blit_auto.h
  3. 10 2
      src/video/sdlgenblit.pl

+ 1 - 0
src/joystick/SDL_joystick.c

@@ -277,6 +277,7 @@ static Uint32 initial_blacklist_devices[] = {
     MAKE_VIDPID(0x1532, 0x0282), // Razer Huntsman Mini Analog, non-functional DInput device
     MAKE_VIDPID(0x26ce, 0x01a2), // ASRock LED Controller
     MAKE_VIDPID(0x20d6, 0x0002), // PowerA Enhanced Wireless Controller for Nintendo Switch (charging port only)
+    MAKE_VIDPID(0x3434, 0x0211), // Keychron K1 Pro System Control
 };
 static SDL_vidpid_list blacklist_devices = {
     SDL_HINT_JOYSTICK_BLACKLIST_DEVICES, 0, 0, NULL,

+ 2 - 1
src/video/SDL_blit_auto.h

@@ -20,12 +20,13 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-#include "SDL_blit.h"
 
 #ifdef SDL_HAVE_BLIT_AUTO
 
 /* *INDENT-OFF* */ // clang-format off
 
+#include "SDL_blit.h"
+
 extern SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[];
 
 /* *INDENT-ON* */ // clang-format on

+ 10 - 2
src/video/sdlgenblit.pl

@@ -112,7 +112,6 @@ sub open_file {
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-#include "SDL_surface_c.h"
 
 #ifdef SDL_HAVE_BLIT_AUTO
 
@@ -641,6 +640,14 @@ sub output_copyinc
 __EOF__
 }
 
+sub output_copyinc_h
+{
+    print FILE <<__EOF__;
+#include "SDL_blit.h"
+
+__EOF__
+}
+
 sub output_copyfunctable
 {
     print FILE <<__EOF__;
@@ -693,7 +700,7 @@ __EOF__
         }
     }
     print FILE <<__EOF__;
-    { 0, 0, 0, 0, NULL }
+    { SDL_PIXELFORMAT_UNKNOWN, SDL_PIXELFORMAT_UNKNOWN, 0, 0, NULL }
 };
 
 __EOF__
@@ -716,6 +723,7 @@ sub output_copyfunc_c
 }
 
 open_file("SDL_blit_auto.h");
+output_copyinc_h();
 output_copydefs();
 for (my $i = 0; $i <= $#src_formats; ++$i) {
     for (my $j = 0; $j <= $#dst_formats; ++$j) {