avoid type redefinition errors after commit ee806597b9.

(Reference issue: https://github.com/libsdl-org/SDL/issues/8142)
main
Ozkan Sezer 2023-08-27 22:22:10 +03:00
parent 615824a806
commit 363f4fa9c1
8 changed files with 17 additions and 3 deletions

View File

@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_ANDROID) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_ANDROID)
#include "../SDL_vulkan_internal.h"
#include "SDL_androidvideo.h" #include "SDL_androidvideo.h"
#include "SDL_androidwindow.h" #include "SDL_androidwindow.h"

View File

@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_KMSDRM) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_KMSDRM)
#include "../SDL_vulkan_internal.h"
#include "SDL_kmsdrmvideo.h" #include "SDL_kmsdrmvideo.h"
#include "SDL_kmsdrmdyn.h" #include "SDL_kmsdrmdyn.h"
#include "SDL_kmsdrmvulkan.h" #include "SDL_kmsdrmvulkan.h"

View File

@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_VIVANTE) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_VIVANTE)
#include "../SDL_vulkan_internal.h"
#include "SDL_vivantevideo.h" #include "SDL_vivantevideo.h"
#include "SDL_vivantevulkan.h" #include "SDL_vivantevulkan.h"

View File

@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WAYLAND) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WAYLAND)
#include "../SDL_vulkan_internal.h"
#include "SDL_waylandvideo.h" #include "SDL_waylandvideo.h"
#include "SDL_waylandwindow.h" #include "SDL_waylandwindow.h"

View File

@ -22,6 +22,9 @@
#ifdef SDL_VIDEO_DRIVER_WINDOWS #ifdef SDL_VIDEO_DRIVER_WINDOWS
#ifdef SDL_VIDEO_VULKAN
#include "../SDL_vulkan_internal.h"
#endif
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h" #include "../SDL_pixels_c.h"
#include "../../SDL_hints_c.h" #include "../../SDL_hints_c.h"

View File

@ -28,6 +28,8 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS)
#include "../SDL_vulkan_internal.h"
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
#include "SDL_windowswindow.h" #include "SDL_windowswindow.h"

View File

@ -29,11 +29,11 @@
#ifndef SDL_windowsvulkan_h_ #ifndef SDL_windowsvulkan_h_
#define SDL_windowsvulkan_h_ #define SDL_windowsvulkan_h_
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS)
#include "../SDL_vulkan_internal.h" #include "../SDL_vulkan_internal.h"
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_WINDOWS)
int WIN_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path); int WIN_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path);
void WIN_Vulkan_UnloadLibrary(SDL_VideoDevice *_this); void WIN_Vulkan_UnloadLibrary(SDL_VideoDevice *_this);
SDL_bool WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this, SDL_bool WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,

View File

@ -22,9 +22,10 @@
#if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_X11) #if defined(SDL_VIDEO_VULKAN) && defined(SDL_VIDEO_DRIVER_X11)
#include "../SDL_vulkan_internal.h"
#include "SDL_x11video.h" #include "SDL_x11video.h"
#include "../SDL_vulkan_internal.h"
#include "SDL_x11vulkan.h" #include "SDL_x11vulkan.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>