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

vkd3d-shader: Pass compile options as an array instead of as flags.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet
2020-06-19 16:13:35 +04:30
committed by Alexandre Julliard
parent 9312979b56
commit b07c304440
7 changed files with 89 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
programs/vkd3d-compiler/main.c
View File

@@ -26,6 +26,8 @@
#include "vkd3d_common.h"
#include "vkd3d_shader.h"
#define MAX_COMPILE_OPTIONS 1
static bool read_shader(struct vkd3d_shader_code *shader, const char *filename)
{
struct stat st;
@@ -87,11 +89,11 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil
static const struct
{
const char *name;
enum vkd3d_shader_compiler_option compiler_option;
enum vkd3d_shader_compile_option_name compile_option;
}
compiler_options[] =
{
{"--strip-debug", VKD3D_SHADER_STRIP_DEBUG},
{"--strip-debug", VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG},
};
static void print_usage(const char *program_name)
@@ -108,9 +110,38 @@ struct options
{
const char *filename;
const char *output_filename;
unsigned int compiler_options;
struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS];
unsigned int compile_option_count;
};
static void add_compile_option(struct options *options,
enum vkd3d_shader_compile_option_name name, unsigned int value)
{
struct vkd3d_shader_compile_option *o;
unsigned int i;
for (i = 0; i < options->compile_option_count; ++i)
{
o = &options->compile_options[i];
if (o->name == name)
{
o->value = value;
return;
}
}
if (options->compile_option_count >= ARRAY_SIZE(options->compile_options))
{
fprintf(stderr, "Ignoring option.\n");
return;
}
o = &options->compile_options[options->compile_option_count++];
o->name = name;
o->value = value;
}
static bool parse_command_line(int argc, char **argv, struct options *options)
{
unsigned int i, j;
@@ -134,7 +165,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options)
{
if (!strcmp(argv[i], compiler_options[j].name))
{
options->compiler_options |= compiler_options[j].compiler_option;
add_compile_option(options, compiler_options[j].compile_option, 1);
break;
}
}
@@ -161,6 +192,8 @@ int main(int argc, char **argv)
info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO;
info.next = NULL;
info.options = options.compile_options;
info.option_count = options.compile_option_count;
if (!read_shader(&info.source, options.filename))
{
@@ -168,7 +201,7 @@ int main(int argc, char **argv)
return 1;
}
ret = vkd3d_shader_compile_dxbc(&info, &spirv, options.compiler_options);
ret = vkd3d_shader_compile_dxbc(&info, &spirv);
vkd3d_shader_free_shader_code(&info.source);
if (ret < 0)
{