wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader-runner: Replace immediate shader type strings with an enum.

Browse Source
This commit is contained in:
Conor McCarthy
2023-09-21 14:32:25 +10:00
committed by Alexandre Julliard
parent 0ef0735999
commit d211160b89
Notes: Alexandre Julliard 2023-10-11 22:53:48 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/346
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/shader_runner_d3d12.c
View File

@@ -56,7 +56,7 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r)
return CONTAINING_RECORD(r, struct d3d12_shader_runner, r);
}
static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, const char *source, const char *type)
static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, const char *source, enum shader_type type)
{
ID3D10Blob *blob = NULL, *errors = NULL;
char profile[7];
@@ -72,7 +72,7 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons
[SHADER_MODEL_5_1] = "5_1",
};
sprintf(profile, "%s_%s", type, shader_models[runner->r.minimum_shader_model]);
sprintf(profile, "%s_%s", shader_type_string(type), shader_models[runner->r.minimum_shader_model]);
hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, runner->r.compile_options, 0, &blob, &errors);
ok(FAILED(hr) == !blob, "Got unexpected hr %#x, blob %p.\n", hr, blob);
if (errors)
@@ -310,7 +310,7 @@ static bool d3d12_runner_dispatch(struct shader_runner *r, unsigned int x, unsig
HRESULT hr;
size_t i;
cs_code = compile_shader(runner, runner->r.cs_source, "cs");
cs_code = compile_shader(runner, runner->r.cs_source, SHADER_TYPE_CS);
todo_if (runner->r.is_todo) ok(cs_code, "Failed to compile shader.\n");
if (!cs_code)
return false;
@@ -385,8 +385,8 @@ static bool d3d12_runner_draw(struct shader_runner *r,
HRESULT hr;
size_t i;
ps_code = compile_shader(runner, runner->r.ps_source, "ps");
vs_code = compile_shader(runner, runner->r.vs_source, "vs");
ps_code = compile_shader(runner, runner->r.ps_source, SHADER_TYPE_PS);
vs_code = compile_shader(runner, runner->r.vs_source, SHADER_TYPE_VS);
todo_if (runner->r.is_todo) ok(ps_code && vs_code, "Failed to compile shaders.\n");
if (!ps_code || !vs_code)