ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Don't pass wined3d_shader to shader_spirv_compile(). 

Signed-off-by: Jan Sikorski <jsikorski@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jan Sikorski 2021-09-30 12:58:01 +02:00 committed by Alexandre Julliard
parent b0f1634b06
commit 1554fc44c7
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/wined3d/shader_spirv.c
View File

@ -278,8 +278,7 @@ static const char *get_line(const char **ptr)
}
static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface,
struct wined3d_shader *shader, const struct shader_spirv_resource_bindings *b,
const struct wined3d_stream_output_desc *so_desc)
const struct shader_spirv_resource_bindings *b, const struct wined3d_stream_output_desc *so_desc)
{
memset(iface, 0, sizeof(*iface));
iface->vkd3d_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO;
@ -305,15 +304,15 @@ static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_sh
}
static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk,
struct wined3d_shader *shader, const struct shader_spirv_compile_arguments *args,
const struct shader_spirv_resource_bindings *bindings, const struct wined3d_stream_output_desc *so_desc)
const struct wined3d_shader_desc *shader_desc, enum wined3d_shader_type shader_type,
const struct shader_spirv_compile_arguments *args, const struct shader_spirv_resource_bindings *bindings,
const struct wined3d_stream_output_desc *so_desc)
{
struct wined3d_shader_spirv_compile_args compile_args;
struct wined3d_shader_spirv_shader_interface iface;
VkShaderModuleCreateInfo shader_create_info;
struct vkd3d_shader_compile_info info;
const struct wined3d_vk_info *vk_info;
enum wined3d_shader_type shader_type;
VkShaderModuleCreateInfo shader_desc;
struct wined3d_device_vk *device_vk;
struct vkd3d_shader_code spirv;
VkShaderModule module;
@ -321,15 +320,14 @@ static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk
VkResult vr;
int ret;
shader_spirv_init_shader_interface_vk(&iface, shader, bindings, so_desc);
shader_type = shader->reg_maps.shader_version.type;
shader_spirv_init_shader_interface_vk(&iface, bindings, so_desc);
shader_spirv_init_compile_args(&compile_args, &iface.vkd3d_interface,
VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, args);
info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO;
info.next = &compile_args.spirv_target;
info.source.code = shader->byte_code;
info.source.size = shader->byte_code_size;
info.source.code = shader_desc->byte_code;
info.source.size = shader_desc->byte_code_size;
info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF;
info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY;
info.options = NULL;
@ -361,12 +359,12 @@ static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk
device_vk = wined3d_device_vk(context_vk->c.device);
vk_info = &device_vk->vk_info;
shader_desc.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
shader_desc.pNext = NULL;
shader_desc.flags = 0;
shader_desc.codeSize = spirv.size;
shader_desc.pCode = spirv.code;
if ((vr = VK_CALL(vkCreateShaderModule(device_vk->vk_device, &shader_desc, NULL, &module))) < 0)
shader_create_info.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
shader_create_info.pNext = NULL;
shader_create_info.flags = 0;
shader_create_info.codeSize = spirv.size;
shader_create_info.pCode = spirv.code;
if ((vr = VK_CALL(vkCreateShaderModule(device_vk->vk_device, &shader_create_info, NULL, &module))) < 0)
{
vkd3d_shader_free_shader_code(&spirv);
WARN("Failed to create Vulkan shader module, vr %s.\n", wined3d_debug_vkresult(vr));
@ -388,6 +386,7 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi
const struct wined3d_stream_output_desc *so_desc = NULL;
struct shader_spirv_graphics_program_vk *program_vk;
struct shader_spirv_compile_arguments args;
struct wined3d_shader_desc shader_desc;
size_t variant_count, i;
shader_spirv_compile_arguments_init(&args, &context_vk->c, shader, state, context_vk->sample_count);
@ -413,7 +412,12 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi
variant_vk = &program_vk->variants[variant_count];
variant_vk->compile_args = args;
variant_vk->binding_base = binding_base;
if (!(variant_vk->vk_module = shader_spirv_compile(context_vk, shader, &args, bindings, so_desc)))
shader_desc.byte_code = shader->byte_code;
shader_desc.byte_code_size = shader->byte_code_size;
if (!(variant_vk->vk_module = shader_spirv_compile(context_vk, &shader_desc, shader_type, &args,
bindings, so_desc)))
return NULL;
++program_vk->variant_count;
@ -429,6 +433,7 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program
struct shader_spirv_compute_program_vk *program;
struct wined3d_pipeline_layout_vk *layout;
VkComputePipelineCreateInfo pipeline_info;
struct wined3d_shader_desc shader_desc;
VkResult vr;
if (!(program = shader->backend_data))
@ -437,7 +442,11 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program
if (program->vk_module)
return program;
if (!(program->vk_module = shader_spirv_compile(context_vk, shader, NULL, bindings, NULL)))
shader_desc.byte_code = shader->byte_code;
shader_desc.byte_code_size = shader->byte_code_size;
if (!(program->vk_module = shader_spirv_compile(context_vk, &shader_desc, WINED3D_SHADER_TYPE_COMPUTE,
NULL, bindings, NULL)))
return NULL;
if (!(layout = wined3d_context_vk_get_pipeline_layout(context_vk,