From 5ab879f89aa1edebde99825744b05084135b9176 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Fri, 26 Jan 2024 03:20:14 +0300 Subject: [PATCH] SDL_kmsdrmvideo.c: move SDL_kmsdrmvulkan.h include to before all others MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes vulkan redefinition errors: In file included from /tmp/SDL3/src/video/kmsdrm/.././khronos/vulkan/vulkan.h:11, from /tmp/SDL3/src/video/kmsdrm/../SDL_vulkan_internal.h:52, from /tmp/SDL3/src/video/kmsdrm/SDL_kmsdrmvulkan.h:32, from /tmp/SDL3/src/video/kmsdrm/SDL_kmsdrmvideo.c:44: /tmp/SDL3/src/video/kmsdrm/.././khronos/vulkan/vulkan_core.h:101: error: redefinition of typedef ‘VkInstance’ /tmp/SDL3/include/SDL3/SDL_vulkan.h:52: note: previous declaration of ‘VkInstance’ was here In file included from /tmp/SDL3/src/video/kmsdrm/.././khronos/vulkan/vulkan.h:11, from /tmp/SDL3/src/video/kmsdrm/../SDL_vulkan_internal.h:52, from /tmp/SDL3/src/video/kmsdrm/SDL_kmsdrmvulkan.h:32, from /tmp/SDL3/src/video/kmsdrm/SDL_kmsdrmvideo.c:44: /tmp/SDL3/src/video/kmsdrm/.././khronos/vulkan/vulkan_core.h:7513: error: redefinition of typedef ‘VkSurfaceKHR’ /tmp/SDL3/include/SDL3/SDL_vulkan.h:53: note: previous declaration of ‘VkSurfaceKHR’ was here make[2]: *** [CMakeFiles/SDL3-shared.dir/src/video/kmsdrm/SDL_kmsdrmvideo.c.o] Error 1 --- src/video/kmsdrm/SDL_kmsdrmvideo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c index d75c0302f2..e2a7bee524 100644 --- a/src/video/kmsdrm/SDL_kmsdrmvideo.c +++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c @@ -23,6 +23,8 @@ #ifdef SDL_VIDEO_DRIVER_KMSDRM +#include "SDL_kmsdrmvulkan.h" + /* SDL internals */ #include "../../events/SDL_events_c.h" #include "../../events/SDL_keyboard_c.h" @@ -41,7 +43,7 @@ #include "SDL_kmsdrmmouse.h" #include "SDL_kmsdrmvideo.h" #include "SDL_kmsdrmopengles.h" -#include "SDL_kmsdrmvulkan.h" +/*#include "SDL_kmsdrmvulkan.h"*/ #include #include #include