[PATCH vkd3d 5/8] vkd3d-shader: Also match the register space when looking up bindings.
Zebediah Figura
zfigura at codeweavers.com
Fri May 22 15:25:40 CDT 2020
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
include/vkd3d_shader.h | 3 +++
libs/vkd3d-shader/spirv.c | 57 +++++++++++++++++----------------------
libs/vkd3d/state.c | 5 ++++
3 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 327b788..67d4562 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -138,6 +138,7 @@ struct vkd3d_shader_parameter
struct vkd3d_shader_resource_binding
{
enum vkd3d_shader_descriptor_type type;
+ unsigned int register_space;
unsigned int register_index;
enum vkd3d_shader_visibility shader_visibility;
unsigned int flags; /* vkd3d_shader_binding_flags */
@@ -159,6 +160,7 @@ struct vkd3d_shader_combined_resource_sampler
struct vkd3d_shader_uav_counter_binding
{
+ unsigned int register_space;
unsigned int register_index; /* u# */
enum vkd3d_shader_visibility shader_visibility;
@@ -168,6 +170,7 @@ struct vkd3d_shader_uav_counter_binding
struct vkd3d_shader_push_constant_buffer
{
+ unsigned int register_space;
unsigned int register_index;
enum vkd3d_shader_visibility shader_visibility;
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 3e4f9f4..695de73 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2232,9 +2232,10 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_
}
static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer(
- const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg)
+ const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_constant_buffer *cb)
{
- unsigned int reg_idx = reg->u.resource_idx;
+ unsigned int reg_idx = cb->src.reg.u.resource_idx;
+ unsigned int register_space = cb->register_space;
unsigned int i;
for (i = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i)
@@ -2244,7 +2245,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_
if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->pc.shader_visibility))
continue;
- if (current->pc.register_index == reg_idx)
+ if (current->pc.register_space == register_space && current->pc.register_index == reg_idx)
return current;
}
@@ -2318,11 +2319,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor
if (current->offset)
FIXME("Atomic counter offsets are not supported yet.\n");
- if (current->register_index == reg_idx)
+ if (current->register_space == register_space && current->register_index == reg_idx)
return current->binding;
}
if (shader_interface->uav_counter_count)
- FIXME("Could not find descriptor binding for UAV counter %u.\n", reg_idx);
+ FIXME("Could not find descriptor binding for UAV counter %u, space %u.\n", reg_idx, register_space);
}
else if (descriptor_type != VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN)
{
@@ -2336,12 +2337,13 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor
if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility))
continue;
- if (current->type == descriptor_type && current->register_index == reg_idx)
+ if (current->type == descriptor_type && current->register_space == register_space
+ && current->register_index == reg_idx)
return current->binding;
}
if (shader_interface->binding_count)
- FIXME("Could not find binding for type %#x, register %u, shader type %#x.\n",
- descriptor_type, reg_idx, compiler->shader_type);
+ FIXME("Could not find binding for type %#x, space %u, register %u, shader type %#x.\n",
+ descriptor_type, register_space, reg_idx, compiler->shader_type);
}
binding.set = 0;
@@ -2359,12 +2361,12 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compil
}
static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxbc_compiler *compiler,
- uint32_t variable_id, const struct vkd3d_shader_register *reg,
+ uint32_t variable_id, const struct vkd3d_shader_register *reg, unsigned int register_space,
enum vkd3d_shader_resource_type resource_type, bool is_uav_counter)
{
struct vkd3d_shader_descriptor_binding binding;
- binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter);
+ binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, register_space, resource_type, is_uav_counter);
vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding);
}
@@ -4969,10 +4971,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi
assert(!(instruction->flags & ~VKD3DSI_INDEXED_DYNAMIC));
- if (cb->register_space)
- FIXME("Unhandled register space %u.\n", cb->register_space);
-
- if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, reg)))
+ if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, cb)))
{
/* Push constant buffers are handled in
* vkd3d_dxbc_compiler_emit_push_constant_buffers().
@@ -5003,7 +5002,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi
pointer_type_id, storage_class, 0);
vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler,
- var_id, reg, VKD3D_SHADER_RESOURCE_BUFFER, false);
+ var_id, reg, cb->register_space, VKD3D_SHADER_RESOURCE_BUFFER, false);
vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);
@@ -5055,9 +5054,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com
uint32_t type_id, ptr_type_id, var_id;
struct vkd3d_symbol reg_symbol;
- if (instruction->declaration.sampler.register_space)
- FIXME("Unhandled register space %u.\n", instruction->declaration.sampler.register_space);
-
if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg))
return;
@@ -5066,8 +5062,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com
var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
ptr_type_id, storage_class, 0);
- vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler,
- var_id, reg, VKD3D_SHADER_RESOURCE_NONE, false);
+ vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg,
+ instruction->declaration.sampler.register_space, VKD3D_SHADER_RESOURCE_NONE, false);
vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);
@@ -5198,8 +5194,9 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_
}
static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_compiler *compiler,
- const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type,
- enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw)
+ const struct vkd3d_shader_register *reg, unsigned int register_space,
+ enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type,
+ unsigned int structure_stride, bool raw)
{
uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0;
const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info;
@@ -5233,7 +5230,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
ptr_type_id, storage_class, 0);
- vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, resource_type, false);
+ vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, register_space, resource_type, false);
vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);
@@ -5256,7 +5253,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp
ptr_type_id, storage_class, 0);
vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler,
- counter_var_id, reg, resource_type, true);
+ counter_var_id, reg, register_space, resource_type, true);
vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset);
}
@@ -5277,12 +5274,10 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co
{
const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic;
- if (semantic->register_space)
- FIXME("Unhandled register space %u.\n", semantic->register_space);
if (instruction->flags)
FIXME("Unhandled UAV flags %#x.\n", instruction->flags);
- vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg,
+ vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, semantic->register_space,
semantic->resource_type, semantic->resource_data_type, 0, false);
}
@@ -5291,12 +5286,10 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler
{
const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource;
- if (resource->register_space)
- FIXME("Unhandled register space %u.\n", resource->register_space);
if (instruction->flags)
FIXME("Unhandled UAV flags %#x.\n", instruction->flags);
- vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg,
+ vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, resource->register_space,
VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true);
}
@@ -5307,12 +5300,10 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c
const struct vkd3d_shader_register *reg = &resource->reg.reg;
unsigned int stride = resource->byte_stride;
- if (resource->register_space)
- FIXME("Unhandled register space %u.\n", resource->register_space);
if (instruction->flags)
FIXME("Unhandled UAV flags %#x.\n", instruction->flags);
- vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg,
+ vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg, resource->register_space,
VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false);
}
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index e1f7da9..3233654 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -510,6 +510,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat
? push_constants[0].stageFlags : stage_flags_from_visibility(p->ShaderVisibility);
root_constant->offset = offset;
+ root_signature->root_constants[j].register_space = 0;
root_signature->root_constants[j].register_index = p->u.Constants.ShaderRegister;
root_signature->root_constants[j].shader_visibility
= vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility);
@@ -541,6 +542,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *
= &root_signature->descriptor_mapping[context->descriptor_index++];
mapping->type = descriptor_type;
+ mapping->register_space = 0;
mapping->register_index = register_idx;
mapping->shader_visibility = shader_visibility;
mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE;
@@ -1451,6 +1453,7 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel
if (!(shader_info->uav_counter_mask & (1u << i)))
continue;
+ state->uav_counters[j].register_space = 0;
state->uav_counters[j].register_index = i;
state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE;
state->uav_counters[j].binding.set = context.set_index;
@@ -2910,6 +2913,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d
set_binding.pImmutableSamplers = NULL;
binding.type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV;
+ binding.register_space = 0;
binding.register_index = 0;
binding.shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE;
binding.binding.set = 0;
@@ -2919,6 +2923,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d
push_constant_range.offset = 0;
push_constant_range.size = sizeof(struct vkd3d_uav_clear_args);
+ push_constant.register_space = 0;
push_constant.register_index = 0;
push_constant.shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE;
push_constant.offset = 0;
--
2.26.2
More information about the wine-devel
mailing list