mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

kmsdrm: Fix Vulkan type redefinition errors from commit 24ed947cc3

Browse Source
This commit is contained in:
Frank Praznik
2024-12-05 10:23:37 -05:00
parent c49f4ceeb2
commit 2e5208f353
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/kmsdrm/SDL_kmsdrmopengles.h
View File

@@ -23,7 +23,6 @@
#ifndef SDL_kmsdrmopengles_h_ #ifndef SDL_kmsdrmopengles_h_
#define SDL_kmsdrmopengles_h_ #define SDL_kmsdrmopengles_h_
#include "../SDL_sysvideo.h"
#include "../SDL_egl_c.h" #include "../SDL_egl_c.h"
// OpenGLES functions // OpenGLES functions

14
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@@ -23,15 +23,11 @@
#ifdef SDL_VIDEO_DRIVER_KMSDRM #ifdef SDL_VIDEO_DRIVER_KMSDRM
/* Include this before SDL_kmsdrmvulkan.h, as the Vulkan header can pull in /* Include this first, as some system headers may pull in EGL headers that
* Wayland headers, which pull in EGL headers with EGL types defined as Wayland * define EGL types as native types for other enabled platforms, which can
* types, which causes warnings when building with strict-aliasing and LTO. * result in type-mismatch warnings when building with LTO.
*/ */
#include "SDL_kmsdrmopengles.h" #include "../SDL_egl_c.h"
/* include this here before SDL_sysvideo.h to avoid vulkan type
* redefinition errors. it already includes SDL_sysvideo.h. */
#include "SDL_kmsdrmvulkan.h"
// SDL internals // SDL internals
#include "../../events/SDL_events_c.h" #include "../../events/SDL_events_c.h"
@@ -49,6 +45,8 @@
#include "SDL_kmsdrmevents.h" #include "SDL_kmsdrmevents.h"
#include "SDL_kmsdrmmouse.h" #include "SDL_kmsdrmmouse.h"
#include "SDL_kmsdrmvideo.h" #include "SDL_kmsdrmvideo.h"
#include "SDL_kmsdrmopengles.h"
#include "SDL_kmsdrmvulkan.h"
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <poll.h> #include <poll.h>

3
src/video/kmsdrm/SDL_kmsdrmvulkan.h
View File

@@ -29,8 +29,7 @@
#ifndef SDL_kmsdrm_vulkan_h_ #ifndef SDL_kmsdrm_vulkan_h_
#define SDL_kmsdrm_vulkan_h_ #define SDL_kmsdrm_vulkan_h_
#include "../SDL_vulkan_internal.h" #include <SDL3/SDL_vulkan.h>
#include "../SDL_sysvideo.h"
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_KMSDRM) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_KMSDRM)