From 63fa1bae3e9d42414e57a2b095ea92bcc28e82d3 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 27 Mar 2023 15:54:54 +0200 Subject: [PATCH] Fix -Wundef warnings due to use of unguarded SDL_VIDEO_RENDER_D3D12 --- include/build_config/SDL_build_config_winrt.h | 2 +- src/render/SDL_d3dmath.c | 2 +- src/render/SDL_d3dmath.h | 2 +- src/render/SDL_render.c | 2 +- src/render/direct3d12/SDL_render_d3d12.c | 4 ++-- src/render/direct3d12/SDL_render_d3d12_xbox.cpp | 2 +- src/render/direct3d12/SDL_shaders_d3d12.c | 2 +- src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp | 2 +- src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/build_config/SDL_build_config_winrt.h b/include/build_config/SDL_build_config_winrt.h index 9fea95f62a..8d717a57ad 100644 --- a/include/build_config/SDL_build_config_winrt.h +++ b/include/build_config/SDL_build_config_winrt.h @@ -205,7 +205,7 @@ #define SDL_VIDEO_RENDER_D3D11 1 /* Disable D3D12 as it's not implemented for WinRT */ -#define SDL_VIDEO_RENDER_D3D12 0 +/* #undef SDL_VIDEO_RENDER_D3D12 */ #if SDL_VIDEO_OPENGL_ES2 #define SDL_VIDEO_RENDER_OGL_ES2 1 diff --git a/src/render/SDL_d3dmath.c b/src/render/SDL_d3dmath.c index 373055ec71..a91852a768 100644 --- a/src/render/SDL_d3dmath.c +++ b/src/render/SDL_d3dmath.c @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if (defined(SDL_VIDEO_RENDER_D3D) || defined(SDL_VIDEO_RENDER_D3D11) || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED +#if (defined(SDL_VIDEO_RENDER_D3D) || defined(SDL_VIDEO_RENDER_D3D11) || defined(SDL_VIDEO_RENDER_D3D12)) && !SDL_RENDER_DISABLED #include "SDL_d3dmath.h" diff --git a/src/render/SDL_d3dmath.h b/src/render/SDL_d3dmath.h index d51744acb6..cec68162c6 100644 --- a/src/render/SDL_d3dmath.h +++ b/src/render/SDL_d3dmath.h @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if (defined(SDL_VIDEO_RENDER_D3D) || defined(SDL_VIDEO_RENDER_D3D11) || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED +#if (defined(SDL_VIDEO_RENDER_D3D) || defined(SDL_VIDEO_RENDER_D3D11) || defined(SDL_VIDEO_RENDER_D3D12)) && !SDL_RENDER_DISABLED /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c index 815e0f0f06..34fc0dbe08 100644 --- a/src/render/SDL_render.c +++ b/src/render/SDL_render.c @@ -89,7 +89,7 @@ this should probably be removed at some point in the future. --ryan. */ #if !SDL_RENDER_DISABLED static const SDL_RenderDriver *render_drivers[] = { -#if SDL_VIDEO_RENDER_D3D12 +#ifdef SDL_VIDEO_RENDER_D3D12 &D3D12_RenderDriver, #endif #ifdef SDL_VIDEO_RENDER_D3D11 diff --git a/src/render/direct3d12/SDL_render_d3d12.c b/src/render/direct3d12/SDL_render_d3d12.c index ad07a9d828..70c9a3d3ea 100644 --- a/src/render/direct3d12/SDL_render_d3d12.c +++ b/src/render/direct3d12/SDL_render_d3d12.c @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED +#if defined(SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED #define SDL_D3D12_NUM_BUFFERS 2 #define SDL_D3D12_NUM_VERTEX_BUFFERS 256 @@ -3050,7 +3050,7 @@ extern "C" { ID3D12Device *device = NULL; -#if SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED +#if defined(SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED D3D12_RenderData *data = (D3D12_RenderData *)renderer->driverdata; /* Make sure that this is a D3D renderer */ diff --git a/src/render/direct3d12/SDL_render_d3d12_xbox.cpp b/src/render/direct3d12/SDL_render_d3d12_xbox.cpp index f90a91814e..f70b4b2596 100644 --- a/src/render/direct3d12/SDL_render_d3d12_xbox.cpp +++ b/src/render/direct3d12/SDL_render_d3d12_xbox.cpp @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED && (defined(__XBOXONE__) || defined(__XBOXSERIES__)) +#if defined(SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED && (defined(__XBOXONE__) || defined(__XBOXSERIES__)) #include "SDL_render_d3d12_xbox.h" #error "This is a placeholder Xbox file, as the real one is under NDA. See README-gdk.md for more info." diff --git a/src/render/direct3d12/SDL_shaders_d3d12.c b/src/render/direct3d12/SDL_shaders_d3d12.c index 89464fe0c3..f412b20651 100644 --- a/src/render/direct3d12/SDL_shaders_d3d12.c +++ b/src/render/direct3d12/SDL_shaders_d3d12.c @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED && !defined(__XBOXONE__) && !defined(__XBOXSERIES__) +#if defined(SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED && !defined(__XBOXONE__) && !defined(__XBOXSERIES__) #include "../../core/windows/SDL_windows.h" #include diff --git a/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp b/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp index dd8d81c771..1e5844b5c2 100644 --- a/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp +++ b/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED && defined(__XBOXONE__) +#if defined(SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED && defined(__XBOXONE__) #error "This is a placeholder Xbox file, as the real one is under NDA. See README-gdk.md for more info." diff --git a/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp b/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp index c2a897146b..0c771b0be9 100644 --- a/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp +++ b/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp @@ -20,7 +20,7 @@ */ #include "SDL_internal.h" -#if SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED && defined(__XBOXSERIES__) +#if defined(SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED && defined(__XBOXSERIES__) #error "This is a placeholder Xbox file, as the real one is under NDA. See README-gdk.md for more info."