wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Add formatting compiler options.

Browse Source 
Signed-off-by: Isabella Bosia <ibosia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Isabella Bosia
2020-09-07 12:35:42 +01:00
committed by Alexandre Julliard
parent f222f99011
commit 75f239dcbe
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vkd3d_shader.h
View File

@@ -97,6 +97,8 @@ enum vkd3d_shader_compile_option_name
VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001,
/** \a value is a member of enum vkd3d_shader_compile_option_buffer_uav. */ /** \a value is a member of enum vkd3d_shader_compile_option_buffer_uav. */
VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002,
/** \a value is a member of enum vkd3d_shader_compile_option_formatting_flags. */
VKD3D_SHADER_COMPILE_OPTION_FORMATTING = 0x00000003,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME),
}; };

12
libs/vkd3d-shader/spirv.c
View File

@@ -2207,6 +2207,7 @@ struct vkd3d_dxbc_compiler
unsigned int spec_constant_count; unsigned int spec_constant_count;
struct vkd3d_shader_spec_constant *spec_constants; struct vkd3d_shader_spec_constant *spec_constants;
size_t spec_constants_size; size_t spec_constants_size;
enum vkd3d_shader_compile_option_formatting_flags formatting;
}; };
static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) static bool is_control_point_phase(const struct vkd3d_shader_phase *phase)
@@ -2267,6 +2268,9 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader
vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler));
compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES |
VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT;
for (i = 0; i < compile_info->option_count; ++i) for (i = 0; i < compile_info->option_count; ++i)
{ {
const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; const struct vkd3d_shader_compile_option *option = &compile_info->options[i];
@@ -2286,6 +2290,10 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader
WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name); WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name);
break; break;
case VKD3D_SHADER_COMPILE_OPTION_FORMATTING:
compiler->formatting = option->value;
break;
default: default:
WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value);
break; break;
@@ -9227,9 +9235,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler,
struct vkd3d_shader_code text; struct vkd3d_shader_code text;
enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler); enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler);
if (vkd3d_spirv_binary_to_text(spirv, environment, if (vkd3d_spirv_binary_to_text(spirv, environment,
get_binary_to_text_options(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES | get_binary_to_text_options(compiler->formatting), &text) != VKD3D_OK)
VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT),
&text) != VKD3D_OK)
return VKD3D_ERROR; return VKD3D_ERROR;
*spirv = text; *spirv = text;
} }