wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader_runner: Compile HLSL for all stages before compiling SPIRV.

Browse Source
This commit is contained in:
Elizabeth Figura 2023-10-27 11:31:47 -05:00 committed by Henri Verbeet
parent d287e0d8a6
commit d12a9738a0
Notes: Henri Verbeet 2024-10-28 18:11:45 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1216
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/shader_runner_vulkan.c
View File

@ -465,9 +465,6 @@ static bool create_shader_stage(struct vulkan_shader_runner *runner,
const struct vulkan_test_context *context = &runner->context; const struct vulkan_test_context *context = &runner->context;
struct vkd3d_shader_code spirv; struct vkd3d_shader_code spirv;
if (!compile_hlsl_and_scan(runner, type))
return false;
if (!compile_d3d_code(runner, type, &spirv)) if (!compile_d3d_code(runner, type, &spirv))
return false; return false;
@ -578,6 +575,24 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner,
VkResult vr; VkResult vr;
int ret; int ret;
ret = compile_hlsl_and_scan(runner, SHADER_TYPE_VS);
ret &= compile_hlsl_and_scan(runner, SHADER_TYPE_PS);
if (runner->r.shader_source[SHADER_TYPE_HS])
{
ret &= compile_hlsl_and_scan(runner, SHADER_TYPE_HS);
ret &= compile_hlsl_and_scan(runner, SHADER_TYPE_DS);
}
if (runner->r.shader_source[SHADER_TYPE_GS])
ret &= compile_hlsl_and_scan(runner, SHADER_TYPE_GS);
if (!ret)
{
/* We ok() only when failing here, so that we don't result in a "todo
* succeeded" when the todo applies to pipeline linking. */
todo_if (runner->r.is_todo) ok(false, "Failed to compile shaders.\n");
return VK_NULL_HANDLE;
}
memset(stage_desc, 0, sizeof(stage_desc)); memset(stage_desc, 0, sizeof(stage_desc));
ret = create_shader_stage(runner, &stage_desc[stage_count++], SHADER_TYPE_VS, VK_SHADER_STAGE_VERTEX_BIT); ret = create_shader_stage(runner, &stage_desc[stage_count++], SHADER_TYPE_VS, VK_SHADER_STAGE_VERTEX_BIT);
ret &= create_shader_stage(runner, &stage_desc[stage_count++], SHADER_TYPE_PS, VK_SHADER_STAGE_FRAGMENT_BIT); ret &= create_shader_stage(runner, &stage_desc[stage_count++], SHADER_TYPE_PS, VK_SHADER_STAGE_FRAGMENT_BIT);
@ -593,11 +608,9 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner,
if (runner->r.shader_source[SHADER_TYPE_GS]) if (runner->r.shader_source[SHADER_TYPE_GS])
ret &= create_shader_stage(runner, &stage_desc[stage_count++], SHADER_TYPE_GS, VK_SHADER_STAGE_GEOMETRY_BIT); ret &= create_shader_stage(runner, &stage_desc[stage_count++], SHADER_TYPE_GS, VK_SHADER_STAGE_GEOMETRY_BIT);
todo_if (runner->r.is_todo) ok(ret, "Failed to compile shaders.\n");
if (!ret) if (!ret)
{ {
/* We ok() only when failing here, so that we don't result in a "todo
* succeeded" when the todo applies to pipeline linking. */
todo_if (runner->r.is_todo) ok(false, "Failed to compile shaders.\n");
for (i = 0; i < ARRAY_SIZE(stage_desc); ++i) for (i = 0; i < ARRAY_SIZE(stage_desc); ++i)
VK_CALL(vkDestroyShaderModule(device, stage_desc[i].module, NULL)); VK_CALL(vkDestroyShaderModule(device, stage_desc[i].module, NULL));
return VK_NULL_HANDLE; return VK_NULL_HANDLE;
@ -747,11 +760,14 @@ static VkPipeline create_compute_pipeline(struct vulkan_shader_runner *runner, V
VkPipeline pipeline; VkPipeline pipeline;
bool ret; bool ret;
ret = create_shader_stage(runner, &pipeline_desc.stage, SHADER_TYPE_CS, VK_SHADER_STAGE_COMPUTE_BIT); ret = compile_hlsl_and_scan(runner, SHADER_TYPE_CS);
todo_if (runner->r.is_todo) ok(ret, "Failed to compile shader.\n"); todo_if (runner->r.is_todo) ok(ret, "Failed to compile shader.\n");
if (!ret) if (!ret)
return VK_NULL_HANDLE; return VK_NULL_HANDLE;
ret = create_shader_stage(runner, &pipeline_desc.stage, SHADER_TYPE_CS, VK_SHADER_STAGE_COMPUTE_BIT);
ok(ret, "Failed to compile shader.\n");
pipeline_desc.layout = pipeline_layout; pipeline_desc.layout = pipeline_layout;
VK_CALL(vkCreateComputePipelines(context->device, VK_NULL_HANDLE, 1, &pipeline_desc, NULL, &pipeline)); VK_CALL(vkCreateComputePipelines(context->device, VK_NULL_HANDLE, 1, &pipeline_desc, NULL, &pipeline));