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: Add test file syntax to specify compiler options.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2023-07-13 07:41:14 +02:00
committed by Alexandre Julliard
parent bd3d4a6c06
commit 01faf6ad9e
Notes: Alexandre Julliard 2023-07-24 22:55:13 +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/261
6 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/shader_runner.c
View File

@@ -111,6 +111,8 @@ static bool match_string(const char *line, const char *token, const char **const
static void parse_require_directive(struct shader_runner *runner, const char *line)
{
unsigned int i;
if (match_string(line, "shader model >=", &line))
{
static const char *const model_strings[] =
@@ -122,7 +124,6 @@ static void parse_require_directive(struct shader_runner *runner, const char *li
[SHADER_MODEL_5_0] = "5.0",
[SHADER_MODEL_5_1] = "5.1",
};
unsigned int i;
for (i = 0; i < ARRAY_SIZE(model_strings); ++i)
{
@@ -135,6 +136,27 @@ static void parse_require_directive(struct shader_runner *runner, const char *li
fatal_error("Unknown shader model '%s'.\n", line);
}
else if (match_string(line, "options:", &line))
{
static const struct option
{
unsigned int option;
const char *name;
}
options[] =
{
{ 0, "none" },
{ D3DCOMPILE_PACK_MATRIX_ROW_MAJOR, "row-major" },
{ D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR, "column-major" },
};
runner->compile_options = 0;
for (i = 0; i < ARRAY_SIZE(options); ++i)
{
if (match_string(line, options[i].name, &line))
runner->compile_options |= options[i].option;
}
}
else
{
fatal_error("Unknown require directive '%s'.\n", line);
@@ -751,9 +773,9 @@ static HRESULT map_unidentified_hrs(HRESULT hr)
static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, HRESULT expect)
{
UINT flags = runner->compile_options | D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY;
ID3D10Blob *blob = NULL, *errors = NULL;
char profile[7];
UINT flags = 0;
HRESULT hr;
static const char *const shader_models[] =
@@ -766,7 +788,6 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz
[SHADER_MODEL_5_1] = "5_1",
};
flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY;
sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]);
hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors);
hr = map_unidentified_hrs(hr);