gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GDK builds after renames done in #10730

Browse Source
This commit is contained in:
Daniel Ludwig
2024-09-07 10:14:02 +02:00
committed by Ozkan Sezer
parent 0a44ea1b0b
commit 1849205733
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gpu/d3d12/SDL_gpu_d3d12.c
View File

@@ -3038,7 +3038,7 @@ static D3D12Buffer *D3D12_INTERNAL_CreateBuffer(
resourceFlags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; resourceFlags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
} }
#if (defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)) #if (defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES))
if (usage & SDL_GPU_BUFFERUSAGE_INDIRECT) { if (usageFlags & SDL_GPU_BUFFERUSAGE_INDIRECT) {
resourceFlags |= D3D12XBOX_RESOURCE_FLAG_ALLOW_INDIRECT_BUFFER; resourceFlags |= D3D12XBOX_RESOURCE_FLAG_ALLOW_INDIRECT_BUFFER;
} }
#endif #endif
@@ -5828,8 +5828,8 @@ static bool D3D12_SupportsSwapchainComposition(
{ {
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
// FIXME: HDR support would be nice to add, but it seems complicated... // FIXME: HDR support would be nice to add, but it seems complicated...
return swapchain_composition == SDL_GPU_SWAPCHAINCOMPOSITION_SDR || return swapchainComposition == SDL_GPU_SWAPCHAINCOMPOSITION_SDR ||
swapchain_composition == SDL_GPU_SWAPCHAINCOMPOSITION_SDR_LINEAR; swapchainComposition == SDL_GPU_SWAPCHAINCOMPOSITION_SDR_LINEAR;
#else #else
D3D12Renderer *renderer = (D3D12Renderer *)driverData; D3D12Renderer *renderer = (D3D12Renderer *)driverData;
DXGI_FORMAT format; DXGI_FORMAT format;
@@ -5937,7 +5937,7 @@ static bool D3D12_INTERNAL_CreateSwapchain(
// Initialize the swapchain data // Initialize the swapchain data
windowData->present_mode = present_mode; windowData->present_mode = present_mode;
windowData->swapchain_composition = swapchain_composition; windowData->swapchainComposition = swapchain_composition;
windowData->swapchainColorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709; windowData->swapchainColorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
windowData->frameCounter = 0; windowData->frameCounter = 0;
windowData->swapchainWidth = width; windowData->swapchainWidth = width;
@@ -5999,7 +5999,7 @@ static bool D3D12_INTERNAL_ResizeSwapchainIfNeeded(
D3D12_INTERNAL_CreateSwapchain( D3D12_INTERNAL_CreateSwapchain(
renderer, renderer,
windowData, windowData,
windowData->swapchain_composition, windowData->swapchainComposition,
windowData->present_mode); windowData->present_mode);
} }
@@ -7525,7 +7525,7 @@ static void D3D12_INTERNAL_InitBlitResources(
} }
} }
static bool D3D12_PrepareDriver(SDL_VideoDevice *this) static bool D3D12_PrepareDriver(SDL_VideoDevice *_this)
{ {
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
return true; return true;
@@ -7922,7 +7922,7 @@ static SDL_GPUDevice *D3D12_CreateDevice(bool debugMode, bool preferLowPower, SD
#if defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXSERIES)
createDeviceParams.DisableDXR = TRUE; createDeviceParams.DisableDXR = TRUE;
#endif #endif
if (debug_mode) { if (debugMode) {
createDeviceParams.ProcessDebugFlags = D3D12XBOX_PROCESS_DEBUG_FLAG_DEBUG; createDeviceParams.ProcessDebugFlags = D3D12XBOX_PROCESS_DEBUG_FLAG_DEBUG;
} }

12
src/gpu/vulkan/SDL_gpu_vulkan.c
View File

@@ -4461,17 +4461,17 @@ static bool VULKAN_INTERNAL_CreateSwapchain(
bool hasValidSwapchainComposition, hasValidPresentMode; bool hasValidSwapchainComposition, hasValidPresentMode;
Sint32 drawableWidth, drawableHeight; Sint32 drawableWidth, drawableHeight;
Uint32 i; Uint32 i;
SDL_VideoDevice *this = SDL_GetVideoDevice(); SDL_VideoDevice *_this = SDL_GetVideoDevice();
SDL_assert(this && this->Vulkan_CreateSurface); SDL_assert(_this && _this->Vulkan_CreateSurface);
swapchainData = SDL_malloc(sizeof(VulkanSwapchainData)); swapchainData = SDL_malloc(sizeof(VulkanSwapchainData));
swapchainData->frameCounter = 0; swapchainData->frameCounter = 0;
// Each swapchain must have its own surface. // Each swapchain must have its own surface.
if (!this->Vulkan_CreateSurface( if (!_this->Vulkan_CreateSurface(
this, _this,
windowData->window, windowData->window,
renderer->instance, renderer->instance,
NULL, // FIXME: VAllocationCallbacks NULL, // FIXME: VAllocationCallbacks
@@ -11629,13 +11629,13 @@ static bool VULKAN_INTERNAL_PrepareVulkan(
return true; return true;
} }
static bool VULKAN_PrepareDriver(SDL_VideoDevice *this) static bool VULKAN_PrepareDriver(SDL_VideoDevice *_this)
{ {
// Set up dummy VulkanRenderer // Set up dummy VulkanRenderer
VulkanRenderer *renderer; VulkanRenderer *renderer;
Uint8 result; Uint8 result;
if (this->Vulkan_CreateSurface == NULL) { if (_this->Vulkan_CreateSurface == NULL) {
return false; return false;
} }