mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d-shader: Passthrough vkd3d_config_flags 

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2021-04-12 11:38:55 +01:00 committed by Hans-Kristian Arntzen
parent 41df41305e
commit 7cfe17d2f5
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vkd3d_shader.h
View File

@ -308,6 +308,8 @@ struct vkd3d_shader_compile_arguments
bool dual_source_blending;
const unsigned int *output_swizzles;
unsigned int output_swizzle_count;
uint64_t config_flags;
};
enum vkd3d_tessellator_output_primitive

1
libs/vkd3d/raytracing_pipeline.c
View File

@ -868,6 +868,7 @@ static HRESULT d3d12_state_object_compile_pipeline(struct d3d12_state_object *ob
compile_args.target_extensions = object->device->vk_info.shader_extensions;
compile_args.target_extension_count = object->device->vk_info.shader_extension_count;
compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0;
compile_args.config_flags = vkd3d_config_flags;
/* TODO: Allow different root signatures per module. */
memset(&shader_interface_info, 0, sizeof(shader_interface_info));

2
libs/vkd3d/state.c
View File

@ -2085,6 +2085,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device,
compile_args.target_extensions = device->vk_info.shader_extensions;
compile_args.target_extension_count = device->vk_info.shader_extension_count;
compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0;
compile_args.config_flags = vkd3d_config_flags;
pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
pipeline_info.pNext = NULL;
@ -2941,6 +2942,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0;
compile_args.target_extension_count = vk_info->shader_extension_count;
compile_args.target_extensions = vk_info->shader_extensions;
compile_args.config_flags = vkd3d_config_flags;
/* Options which are exclusive to PS. Especially output swizzles must only be used in PS. */
ps_compile_args = compile_args;