From 73898a0a6493c43943dc675ad1eccd03e16ba0d7 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 2 Sep 2024 18:14:31 -0700 Subject: [PATCH] Renamed NDA platform constants to "PRIVATE" --- include/SDL3/SDL_gpu.h | 8 ++++---- src/gpu/SDL_gpu.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/SDL3/SDL_gpu.h b/include/SDL3/SDL_gpu.h index a86c5cd264..7033ee110b 100644 --- a/include/SDL3/SDL_gpu.h +++ b/include/SDL3/SDL_gpu.h @@ -286,7 +286,7 @@ typedef enum SDL_GPUShaderStage typedef Uint32 SDL_GPUShaderFormat; -#define SDL_GPU_SHADERFORMAT_SECRET (1u << 0) /**< shaders for NDA'd platforms */ +#define SDL_GPU_SHADERFORMAT_PRIVATE (1u << 0) /**< shaders for NDA'd platforms */ #define SDL_GPU_SHADERFORMAT_SPIRV (1u << 1) /**< SPIR-V shaders for Vulkan */ #define SDL_GPU_SHADERFORMAT_DXBC (1u << 2) /**< DXBC SM5_0 shaders for D3D11 */ #define SDL_GPU_SHADERFORMAT_DXIL (1u << 3) /**< DXIL shaders for D3D12 */ @@ -495,7 +495,7 @@ typedef enum SDL_GPUSwapchainComposition typedef enum SDL_GPUDriver { SDL_GPU_DRIVER_INVALID = -1, - SDL_GPU_DRIVER_SECRET, /* NDA'd platforms */ + SDL_GPU_DRIVER_PRIVATE, /* NDA'd platforms */ SDL_GPU_DRIVER_VULKAN, SDL_GPU_DRIVER_D3D11, SDL_GPU_DRIVER_D3D12, @@ -977,7 +977,7 @@ extern SDL_DECLSPEC SDL_GPUDevice *SDLCALL SDL_CreateGPUDevice( * * These are the current shader format properties: * - * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SECRET_BOOL`: The app is able to + * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL`: The app is able to * provide shaders for an NDA platform. * - `SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL`: The app is able to * provide SPIR-V shaders if applicable. @@ -1009,7 +1009,7 @@ extern SDL_DECLSPEC SDL_GPUDevice *SDLCALL SDL_CreateGPUDeviceWithProperties( #define SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL "SDL.gpu.device.create.debugmode" #define SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL "SDL.gpu.device.create.preferlowpower" #define SDL_PROP_GPU_DEVICE_CREATE_NAME_STRING "SDL.gpu.device.create.name" -#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SECRET_BOOL "SDL.gpu.device.create.shaders.secret" +#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL "SDL.gpu.device.create.shaders.private" #define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL "SDL.gpu.device.create.shaders.spirv" #define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL "SDL.gpu.device.create.shaders.dxbc" #define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL "SDL.gpu.device.create.shaders.dxil" diff --git a/src/gpu/SDL_gpu.c b/src/gpu/SDL_gpu.c index 6f12b88830..2193cf9b81 100644 --- a/src/gpu/SDL_gpu.c +++ b/src/gpu/SDL_gpu.c @@ -398,8 +398,8 @@ SDL_GPUDevice *SDL_CreateGPUDevice( { SDL_GPUDevice *result; SDL_PropertiesID props = SDL_CreateProperties(); - if (formatFlags & SDL_GPU_SHADERFORMAT_SECRET) { - SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SECRET_BOOL, true); + if (formatFlags & SDL_GPU_SHADERFORMAT_PRIVATE) { + SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL, true); } if (formatFlags & SDL_GPU_SHADERFORMAT_SPIRV) { SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL, true); @@ -440,8 +440,8 @@ SDL_GPUDevice *SDL_CreateGPUDeviceWithProperties(SDL_PropertiesID props) return NULL; } - if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SECRET_BOOL, false)) { - formatFlags |= SDL_GPU_SHADERFORMAT_SECRET; + if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL, false)) { + formatFlags |= SDL_GPU_SHADERFORMAT_PRIVATE; } if (SDL_GetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL, false)) { formatFlags |= SDL_GPU_SHADERFORMAT_SPIRV;