wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Split spirv_compiler_has_combined_sampler() into two functions.

Browse Source 
These functions do not really share any code in common.
This commit is contained in:
Zebediah Figura 2023-08-09 19:14:54 -05:00 committed by Alexandre Julliard
parent 18c1477464
commit a1e10e5c90
Notes: Alexandre Julliard 2023-08-28 22:16:59 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/312
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2594,8 +2594,8 @@ static struct vkd3d_push_constant_buffer_binding *spirv_compiler_find_push_const
return NULL; return NULL;
} }
static bool spirv_compiler_has_combined_sampler(const struct spirv_compiler *compiler, static bool spirv_compiler_has_combined_sampler_for_resource(const struct spirv_compiler *compiler,
const struct vkd3d_shader_resource *resource, const struct vkd3d_shader_sampler *sampler) const struct vkd3d_shader_resource *resource)
{ {
const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface;
const struct vkd3d_shader_combined_resource_sampler *combined_sampler; const struct vkd3d_shader_combined_resource_sampler *combined_sampler;
@ -2604,10 +2604,7 @@ static bool spirv_compiler_has_combined_sampler(const struct spirv_compiler *com
if (!shader_interface->combined_sampler_count) if (!shader_interface->combined_sampler_count)
return false; return false;
if (resource && (resource->reg.reg.type == VKD3DSPR_UAV || resource->range.last != resource->range.first)) if (resource->reg.reg.type == VKD3DSPR_UAV || resource->range.last != resource->range.first)
return false;
if (sampler && sampler->range.first != sampler->range.last)
return false; return false;
for (i = 0; i < shader_interface->combined_sampler_count; ++i) for (i = 0; i < shader_interface->combined_sampler_count; ++i)
@ -2617,10 +2614,36 @@ static bool spirv_compiler_has_combined_sampler(const struct spirv_compiler *com
if (!spirv_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) if (!spirv_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility))
continue; continue;
if ((!resource || (combined_sampler->resource_space == resource->range.space if ((combined_sampler->resource_space == resource->range.space
&& combined_sampler->resource_index == resource->range.first)) && combined_sampler->resource_index == resource->range.first))
&& (!sampler || (combined_sampler->sampler_space == sampler->range.space return true;
&& combined_sampler->sampler_index == sampler->range.first))) }
return false;
}
static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_compiler *compiler,
const struct vkd3d_shader_sampler *sampler)
{
const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface;
const struct vkd3d_shader_combined_resource_sampler *combined_sampler;
unsigned int i;
if (!shader_interface->combined_sampler_count)
return false;
if (sampler->range.last != sampler->range.first)
return false;
for (i = 0; i < shader_interface->combined_sampler_count; ++i)
{
combined_sampler = &shader_interface->combined_samplers[i];
if (!spirv_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility))
continue;
if (combined_sampler->sampler_space == sampler->range.space
&& combined_sampler->sampler_index == sampler->range.first)
return true; return true;
} }
@ -5648,7 +5671,7 @@ static void spirv_compiler_emit_dcl_sampler(struct spirv_compiler *compiler,
reg_symbol.info.sampler.range = sampler->range; reg_symbol.info.sampler.range = sampler->range;
spirv_compiler_put_symbol(compiler, &reg_symbol); spirv_compiler_put_symbol(compiler, &reg_symbol);
if (spirv_compiler_has_combined_sampler(compiler, NULL, sampler)) if (spirv_compiler_has_combined_sampler_for_sampler(compiler, sampler))
return; return;
type_id = vkd3d_spirv_get_op_type_sampler(builder); type_id = vkd3d_spirv_get_op_type_sampler(builder);
@ -5860,7 +5883,7 @@ static void spirv_compiler_emit_resource_declaration(struct spirv_compiler *comp
sampled_type = vkd3d_component_type_from_data_type(resource_data_type); sampled_type = vkd3d_component_type_from_data_type(resource_data_type);
if (spirv_compiler_has_combined_sampler(compiler, resource, NULL)) if (spirv_compiler_has_combined_sampler_for_resource(compiler, resource))
{ {
spirv_compiler_emit_combined_sampler_declarations(compiler, reg, &resource->range, spirv_compiler_emit_combined_sampler_declarations(compiler, reg, &resource->range,
resource_type, sampled_type, structure_stride, raw, resource_type_info); resource_type, sampled_type, structure_stride, raw, resource_type_info);