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

gpu: Show a debug error when pipelines are not given the right shader stages

Browse Source
This commit is contained in:
Ethan Lee
2025-01-09 14:53:17 -05:00
parent 00b23a012c
commit 90aff306c1
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -962,6 +962,7 @@ struct D3D12Shader
void *bytecode; void *bytecode;
size_t bytecodeSize; size_t bytecodeSize;
SDL_GPUShaderStage stage;
Uint32 num_samplers; Uint32 num_samplers;
Uint32 numUniformBuffers; Uint32 numUniformBuffers;
Uint32 numStorageBuffers; Uint32 numStorageBuffers;
@@ -2858,6 +2859,15 @@ static SDL_GPUGraphicsPipeline *D3D12_CreateGraphicsPipeline(
D3D12Shader *vertShader = (D3D12Shader *)createinfo->vertex_shader; D3D12Shader *vertShader = (D3D12Shader *)createinfo->vertex_shader;
D3D12Shader *fragShader = (D3D12Shader *)createinfo->fragment_shader; D3D12Shader *fragShader = (D3D12Shader *)createinfo->fragment_shader;
if (renderer->debug_mode) {
if (vertShader->stage != SDL_GPU_SHADERSTAGE_VERTEX) {
SDL_assert_release(!"CreateGraphicsPipeline was passed a fragment shader for the vertex stage");
}
if (fragShader->stage != SDL_GPU_SHADERSTAGE_FRAGMENT) {
SDL_assert_release(!"CreateGraphicsPipeline was passed a vertex shader for the fragment stage");
}
}
D3D12_GRAPHICS_PIPELINE_STATE_DESC psoDesc; D3D12_GRAPHICS_PIPELINE_STATE_DESC psoDesc;
SDL_zero(psoDesc); SDL_zero(psoDesc);
psoDesc.VS.pShaderBytecode = vertShader->bytecode; psoDesc.VS.pShaderBytecode = vertShader->bytecode;
@@ -3028,6 +3038,7 @@ static SDL_GPUShader *D3D12_CreateShader(
SDL_free(bytecode); SDL_free(bytecode);
return NULL; return NULL;
} }
shader->stage = createinfo->stage;
shader->num_samplers = createinfo->num_samplers; shader->num_samplers = createinfo->num_samplers;
shader->numStorageBuffers = createinfo->num_storage_buffers; shader->numStorageBuffers = createinfo->num_storage_buffers;
shader->numStorageTextures = createinfo->num_storage_textures; shader->numStorageTextures = createinfo->num_storage_textures;

10
src/gpu/metal/SDL_gpu_metal.m
View File

@@ -471,6 +471,7 @@ typedef struct MetalShader
id<MTLLibrary> library; id<MTLLibrary> library;
id<MTLFunction> function; id<MTLFunction> function;
SDL_GPUShaderStage stage;
Uint32 numSamplers; Uint32 numSamplers;
Uint32 numUniformBuffers; Uint32 numUniformBuffers;
Uint32 numStorageBuffers; Uint32 numStorageBuffers;
@@ -1083,6 +1084,14 @@ static SDL_GPUGraphicsPipeline *METAL_CreateGraphicsPipeline(
NSError *error = NULL; NSError *error = NULL;
MetalGraphicsPipeline *result = NULL; MetalGraphicsPipeline *result = NULL;
if (renderer->debugMode) {
if (vertexShader->stage != SDL_GPU_SHADERSTAGE_VERTEX) {
SDL_assert_release(!"CreateGraphicsPipeline was passed a fragment shader for the vertex stage");
}
if (fragmentShader->stage != SDL_GPU_SHADERSTAGE_FRAGMENT) {
SDL_assert_release(!"CreateGraphicsPipeline was passed a vertex shader for the fragment stage");
}
}
pipelineDescriptor = [MTLRenderPipelineDescriptor new]; pipelineDescriptor = [MTLRenderPipelineDescriptor new];
// Blend // Blend
@@ -1380,6 +1389,7 @@ static SDL_GPUShader *METAL_CreateShader(
result = SDL_calloc(1, sizeof(MetalShader)); result = SDL_calloc(1, sizeof(MetalShader));
result->library = libraryFunction.library; result->library = libraryFunction.library;
result->function = libraryFunction.function; result->function = libraryFunction.function;
result->stage = createinfo->stage;
result->numSamplers = createinfo->num_samplers; result->numSamplers = createinfo->num_samplers;
result->numStorageBuffers = createinfo->num_storage_buffers; result->numStorageBuffers = createinfo->num_storage_buffers;
result->numStorageTextures = createinfo->num_storage_textures; result->numStorageTextures = createinfo->num_storage_textures;

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

@@ -607,6 +607,7 @@ typedef struct VulkanShader
{ {
VkShaderModule shaderModule; VkShaderModule shaderModule;
const char *entrypointName; const char *entrypointName;
SDL_GPUShaderStage stage;
Uint32 numSamplers; Uint32 numSamplers;
Uint32 numStorageTextures; Uint32 numStorageTextures;
Uint32 numStorageBuffers; Uint32 numStorageBuffers;
@@ -6229,6 +6230,15 @@ static SDL_GPUGraphicsPipeline *VULKAN_CreateGraphicsPipeline(
shaderStageCreateInfos[1].pName = graphicsPipeline->fragmentShader->entrypointName; shaderStageCreateInfos[1].pName = graphicsPipeline->fragmentShader->entrypointName;
shaderStageCreateInfos[1].pSpecializationInfo = NULL; shaderStageCreateInfos[1].pSpecializationInfo = NULL;
if (renderer->debugMode) {
if (graphicsPipeline->vertexShader->stage != SDL_GPU_SHADERSTAGE_VERTEX) {
SDL_assert_release(!"CreateGraphicsPipeline was passed a fragment shader for the vertex stage");
}
if (graphicsPipeline->fragmentShader->stage != SDL_GPU_SHADERSTAGE_FRAGMENT) {
SDL_assert_release(!"CreateGraphicsPipeline was passed a vertex shader for the fragment stage");
}
}
// Vertex input // Vertex input
for (i = 0; i < createinfo->vertex_input_state.num_vertex_buffers; i += 1) { for (i = 0; i < createinfo->vertex_input_state.num_vertex_buffers; i += 1) {
@@ -6635,6 +6645,7 @@ static SDL_GPUShader *VULKAN_CreateShader(
vulkanShader->entrypointName = SDL_malloc(entryPointNameLength); vulkanShader->entrypointName = SDL_malloc(entryPointNameLength);
SDL_utf8strlcpy((char *)vulkanShader->entrypointName, createinfo->entrypoint, entryPointNameLength); SDL_utf8strlcpy((char *)vulkanShader->entrypointName, createinfo->entrypoint, entryPointNameLength);
vulkanShader->stage = createinfo->stage;
vulkanShader->numSamplers = createinfo->num_samplers; vulkanShader->numSamplers = createinfo->num_samplers;
vulkanShader->numStorageTextures = createinfo->num_storage_textures; vulkanShader->numStorageTextures = createinfo->num_storage_textures;
vulkanShader->numStorageBuffers = createinfo->num_storage_buffers; vulkanShader->numStorageBuffers = createinfo->num_storage_buffers;