spirv2dxil: Fix the spirv2dxil command line tool

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27280>
This commit is contained in:
Jesse Natalie
2024-01-25 10:01:05 -08:00
committed by Marge Bot
parent 6825c67c99
commit 4833126b40

View File

@@ -172,7 +172,7 @@ main(int argc, char **argv)
memset(shaders, 0, sizeof(shaders));
struct shader cur_shader = {
.entry_point = "main",
.output_file = "",
.output_file = NULL,
};
gl_shader_stage shader_stage = MESA_SHADER_FRAGMENT;
@@ -184,6 +184,12 @@ main(int argc, char **argv)
conf.declared_read_only_images_as_srvs = true;
conf.shader_model_max = SHADER_MODEL_6_2;
const unsigned supported_bit_sizes = 16 | 32 | 64;
dxil_get_nir_compiler_options(&nir_options, conf.shader_model_max, supported_bit_sizes, supported_bit_sizes);
// We will manually handle base_vertex when vertex_id and instance_id have
// have been already converted to zero-base.
nir_options.lower_base_vertex = false;
bool any_shaders = false;
while ((ch = getopt_long(argc, argv, "-s:e:o:m:x:vd", long_options, NULL)) !=
-1) {
@@ -226,12 +232,6 @@ main(int argc, char **argv)
}
}
const unsigned supported_bit_sizes = 16 | 32 | 64;
dxil_get_nir_compiler_options(&nir_options, conf.shader_model_max, supported_bit_sizes, supported_bit_sizes);
// We will manually handle base_vertex when vertex_id and instance_id have
// have been already converted to zero-base.
nir_options.lower_base_vertex = false;
if (!any_shaders) {
fprintf(stderr, "Specify a shader filename\n");
return 1;