wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Declare samplers from the descriptor info.

Browse Source
This commit is contained in:
Zebediah Figura 2023-08-09 19:42:42 -05:00 committed by Alexandre Julliard
parent a1e10e5c90
commit 547768bcdd
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 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2623,7 +2623,7 @@ static bool spirv_compiler_has_combined_sampler_for_resource(const struct spirv_
} }
static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_compiler *compiler, static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_compiler *compiler,
const struct vkd3d_shader_sampler *sampler) const struct vkd3d_shader_register_range *range)
{ {
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;
@ -2632,7 +2632,7 @@ static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_c
if (!shader_interface->combined_sampler_count) if (!shader_interface->combined_sampler_count)
return false; return false;
if (sampler->range.last != sampler->range.first) if (range->last != range->first)
return false; return false;
for (i = 0; i < shader_interface->combined_sampler_count; ++i) for (i = 0; i < shader_interface->combined_sampler_count; ++i)
@ -2642,8 +2642,8 @@ static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_c
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 (combined_sampler->sampler_space == sampler->range.space if (combined_sampler->sampler_space == range->space
&& combined_sampler->sampler_index == sampler->range.first) && combined_sampler->sampler_index == range->first)
return true; return true;
} }
@ -5656,29 +5656,34 @@ static void spirv_compiler_emit_dcl_immediate_constant_buffer(struct spirv_compi
spirv_compiler_put_symbol(compiler, &reg_symbol); spirv_compiler_put_symbol(compiler, &reg_symbol);
} }
static void spirv_compiler_emit_dcl_sampler(struct spirv_compiler *compiler, static void spirv_compiler_emit_sampler_declaration(struct spirv_compiler *compiler,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_register_range *range, unsigned int register_id)
{ {
const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler;
const SpvStorageClass storage_class = SpvStorageClassUniformConstant; const SpvStorageClass storage_class = SpvStorageClassUniformConstant;
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_register *reg = &sampler->src.reg;
struct vkd3d_descriptor_variable_info var_info; struct vkd3d_descriptor_variable_info var_info;
struct vkd3d_symbol reg_symbol; struct vkd3d_symbol reg_symbol;
uint32_t type_id, var_id; uint32_t type_id, var_id;
vkd3d_symbol_make_sampler(&reg_symbol, reg); const struct vkd3d_shader_register reg =
reg_symbol.info.sampler.range = sampler->range; {
.type = VKD3DSPR_SAMPLER,
.idx[0].offset = register_id,
.idx_count = 1,
};
vkd3d_symbol_make_sampler(&reg_symbol, &reg);
reg_symbol.info.sampler.range = *range;
spirv_compiler_put_symbol(compiler, &reg_symbol); spirv_compiler_put_symbol(compiler, &reg_symbol);
if (spirv_compiler_has_combined_sampler_for_sampler(compiler, sampler)) if (spirv_compiler_has_combined_sampler_for_sampler(compiler, range))
return; return;
type_id = vkd3d_spirv_get_op_type_sampler(builder); type_id = vkd3d_spirv_get_op_type_sampler(builder);
var_id = spirv_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, var_id = spirv_compiler_build_descriptor_variable(compiler, storage_class, type_id, &reg,
&sampler->range, VKD3D_SHADER_RESOURCE_NONE, false, &var_info); range, VKD3D_SHADER_RESOURCE_NONE, false, &var_info);
vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_make_register(&reg_symbol, &reg);
vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class,
VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL);
reg_symbol.descriptor_array = var_info.array_symbol; reg_symbol.descriptor_array = var_info.array_symbol;
@ -9214,9 +9219,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER:
spirv_compiler_emit_dcl_immediate_constant_buffer(compiler, instruction); spirv_compiler_emit_dcl_immediate_constant_buffer(compiler, instruction);
break; break;
case VKD3DSIH_DCL_SAMPLER:
spirv_compiler_emit_dcl_sampler(compiler, instruction);
break;
case VKD3DSIH_DCL: case VKD3DSIH_DCL:
case VKD3DSIH_DCL_UAV_TYPED: case VKD3DSIH_DCL_UAV_TYPED:
spirv_compiler_emit_dcl_resource(compiler, instruction); spirv_compiler_emit_dcl_resource(compiler, instruction);
@ -9525,6 +9527,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
spirv_compiler_emit_cut_stream(compiler, instruction); spirv_compiler_emit_cut_stream(compiler, instruction);
break; break;
case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR:
case VKD3DSIH_DCL_SAMPLER:
case VKD3DSIH_DCL_TEMPS: case VKD3DSIH_DCL_TEMPS:
case VKD3DSIH_HS_DECLS: case VKD3DSIH_HS_DECLS:
case VKD3DSIH_NOP: case VKD3DSIH_NOP:
@ -9537,6 +9540,39 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
return ret; return ret;
} }
static void spirv_compiler_emit_descriptor_declarations(struct spirv_compiler *compiler)
{
unsigned int i;
for (i = 0; i < compiler->scan_descriptor_info->descriptor_count; ++i)
{
const struct vkd3d_shader_descriptor_info1 *descriptor = &compiler->scan_descriptor_info->descriptors[i];
struct vkd3d_shader_register_range range;
range.first = descriptor->register_index;
if (descriptor->count == ~0u)
range.last = ~0u;
else
range.last = descriptor->register_index + descriptor->count - 1;
range.space = descriptor->register_space;
switch (descriptor->type)
{
case VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER:
spirv_compiler_emit_sampler_declaration(compiler, &range, descriptor->register_id);
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV:
case VKD3D_SHADER_DESCRIPTOR_TYPE_SRV:
case VKD3D_SHADER_DESCRIPTOR_TYPE_UAV:
break;
default:
vkd3d_unreachable();
}
}
}
static void spirv_compiler_emit_sm1_constant_buffer(struct spirv_compiler *compiler, static void spirv_compiler_emit_sm1_constant_buffer(struct spirv_compiler *compiler,
const struct vkd3d_shader_desc *desc, enum vkd3d_shader_d3dbc_constant_register set, const struct vkd3d_shader_desc *desc, enum vkd3d_shader_d3dbc_constant_register set,
enum vkd3d_data_type data_type) enum vkd3d_data_type data_type)
@ -9572,6 +9608,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
if (parser->shader_desc.temp_count) if (parser->shader_desc.temp_count)
spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count); spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count);
spirv_compiler_emit_descriptor_declarations(compiler);
spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc, spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc,
VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER, VKD3D_DATA_FLOAT); VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER, VKD3D_DATA_FLOAT);
spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc, spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc,