wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Use the correct union members for raw and structured resources.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-05-06 13:41:30 -05:00
committed by Henri Verbeet
parent 85d2703c03
commit 9552dab5aa
Notes: Henri Verbeet 2025-06-04 13:13:50 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1531
2 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libs/vkd3d-shader/hlsl_codegen.c
View File

@@ -12114,14 +12114,11 @@ static void sm4_generate_vsir_add_dcl_texture(struct hlsl_ctx *ctx,
bool uav) bool uav)
{ {
enum hlsl_regset regset = uav ? HLSL_REGSET_UAVS : HLSL_REGSET_TEXTURES; enum hlsl_regset regset = uav ? HLSL_REGSET_UAVS : HLSL_REGSET_TEXTURES;
struct vkd3d_shader_structured_resource *structured_resource;
struct vkd3d_shader_dst_param *dst_param;
struct vkd3d_shader_semantic *semantic;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
struct hlsl_type *component_type; struct hlsl_type *component_type;
enum vkd3d_shader_opcode opcode; enum vkd3d_shader_opcode opcode;
bool multisampled; bool multisampled;
unsigned int i, j; unsigned int i;
VKD3D_ASSERT(resource->regset == regset); VKD3D_ASSERT(resource->regset == regset);
VKD3D_ASSERT(hlsl_version_lt(ctx, 5, 1) || resource->bind_count == 1); VKD3D_ASSERT(hlsl_version_lt(ctx, 5, 1) || resource->bind_count == 1);
@@ -12132,6 +12129,7 @@ static void sm4_generate_vsir_add_dcl_texture(struct hlsl_ctx *ctx,
{ {
unsigned int array_first = resource->index + i; unsigned int array_first = resource->index + i;
unsigned int array_last = resource->index + i; /* FIXME: array end. */ unsigned int array_last = resource->index + i; /* FIXME: array end. */
struct vkd3d_shader_resource *vsir_resource;
if (resource->var && !resource->var->objects_usage[regset][i].used) if (resource->var && !resource->var->objects_usage[regset][i].used)
continue; continue;
@@ -12169,13 +12167,16 @@ static void sm4_generate_vsir_add_dcl_texture(struct hlsl_ctx *ctx,
ctx->result = VKD3D_ERROR_OUT_OF_MEMORY; ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
return; return;
} }
semantic = &ins->declaration.semantic;
structured_resource = &ins->declaration.structured_resource;
dst_param = &semantic->resource.reg;
vsir_dst_param_init(dst_param, uav ? VKD3DSPR_UAV : VKD3DSPR_RESOURCE, VKD3D_DATA_UNUSED, 0);
if (uav && component_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) if (component_type->sampler_dim == HLSL_SAMPLER_DIM_RAW_BUFFER)
structured_resource->byte_stride = 4 * component_type->e.resource.format->reg_size[HLSL_REGSET_NUMERIC]; vsir_resource = &ins->declaration.raw_resource.resource;
else if (component_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER)
vsir_resource = &ins->declaration.structured_resource.resource;
else
vsir_resource = &ins->declaration.semantic.resource;
vsir_dst_param_init(&vsir_resource->reg, uav ? VKD3DSPR_UAV : VKD3DSPR_RESOURCE, VKD3D_DATA_UNUSED, 0);
if (uav && component_type->e.resource.rasteriser_ordered) if (uav && component_type->e.resource.rasteriser_ordered)
ins->flags = VKD3DSUF_RASTERISER_ORDERED_VIEW; ins->flags = VKD3DSUF_RASTERISER_ORDERED_VIEW;
@@ -12189,29 +12190,35 @@ static void sm4_generate_vsir_add_dcl_texture(struct hlsl_ctx *ctx,
ctx->profile->major_version, ctx->profile->minor_version); ctx->profile->major_version, ctx->profile->minor_version);
} }
for (j = 0; j < 4; ++j) vsir_resource->range.first = array_first;
semantic->resource_data_type[j] = sm4_generate_vsir_get_format_type(component_type); vsir_resource->range.last = array_last;
vsir_resource->range.space = resource->space;
semantic->resource.range.first = array_first; vsir_resource->reg.reg.idx[0].offset = resource->id;
semantic->resource.range.last = array_last; vsir_resource->reg.reg.idx[1].offset = array_first;
semantic->resource.range.space = resource->space; vsir_resource->reg.reg.idx[2].offset = array_last;
vsir_resource->reg.reg.idx_count = 3;
dst_param->reg.idx[0].offset = resource->id;
dst_param->reg.idx[1].offset = array_first;
dst_param->reg.idx[2].offset = array_last;
dst_param->reg.idx_count = 3;
ins->resource_type = sm4_generate_vsir_get_resource_type(resource->component_type); ins->resource_type = sm4_generate_vsir_get_resource_type(resource->component_type);
if (resource->component_type->sampler_dim == HLSL_SAMPLER_DIM_RAW_BUFFER)
if (component_type->sampler_dim == HLSL_SAMPLER_DIM_RAW_BUFFER)
{
ins->raw = true; ins->raw = true;
if (resource->component_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER) }
else if (component_type->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER)
{ {
ins->structured = true; ins->structured = true;
ins->resource_stride = 4 * component_type->e.resource.format->reg_size[HLSL_REGSET_NUMERIC]; ins->resource_stride = 4 * component_type->e.resource.format->reg_size[HLSL_REGSET_NUMERIC];
ins->declaration.structured_resource.byte_stride = ins->resource_stride;
} }
else
{
for (unsigned int j = 0; j < 4; ++j)
ins->declaration.semantic.resource_data_type[j] = sm4_generate_vsir_get_format_type(component_type);
if (multisampled) if (multisampled)
semantic->sample_count = component_type->sample_count; ins->declaration.semantic.sample_count = component_type->sample_count;
}
} }
} }

44
libs/vkd3d-shader/tpf.c
View File

@@ -3859,9 +3859,8 @@ static uint32_t pack_resource_data_type(const enum vkd3d_data_type *resource_dat
static void tpf_dcl_texture(const struct tpf_compiler *tpf, const struct vkd3d_shader_instruction *ins) static void tpf_dcl_texture(const struct tpf_compiler *tpf, const struct vkd3d_shader_instruction *ins)
{ {
const struct vkd3d_shader_structured_resource *structured_resource = &ins->declaration.structured_resource;
const struct vkd3d_shader_semantic *semantic = &ins->declaration.semantic;
const struct vkd3d_shader_version *version = &tpf->program->shader_version; const struct vkd3d_shader_version *version = &tpf->program->shader_version;
const struct vkd3d_shader_resource *resource;
const struct vkd3d_sm4_opcode_info *info; const struct vkd3d_sm4_opcode_info *info;
struct sm4_instruction instr = {0}; struct sm4_instruction instr = {0};
bool uav; bool uav;
@@ -3875,27 +3874,38 @@ static void tpf_dcl_texture(const struct tpf_compiler *tpf, const struct vkd3d_s
instr.opcode = info->opcode; instr.opcode = info->opcode;
instr.dsts[0] = semantic->resource.reg;
instr.dst_count = 1;
if (ins->opcode == VKD3DSIH_DCL || ins->opcode == VKD3DSIH_DCL_UAV_TYPED) if (ins->opcode == VKD3DSIH_DCL || ins->opcode == VKD3DSIH_DCL_UAV_TYPED)
{ {
instr.idx[0] = pack_resource_data_type(semantic->resource_data_type); instr.idx[0] = pack_resource_data_type(ins->declaration.semantic.resource_data_type);
instr.idx_count = 1; instr.idx_count = 1;
instr.extra_bits |= ins->declaration.semantic.sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT;
resource = &ins->declaration.semantic.resource;
} }
else if (ins->opcode == VKD3DSIH_DCL_RESOURCE_RAW || ins->opcode == VKD3DSIH_DCL_UAV_RAW)
if (vkd3d_shader_ver_ge(version, 5, 1))
{ {
instr.dsts[0].reg.idx[0].offset = semantic->resource.reg.reg.idx[0].offset; resource = &ins->declaration.raw_resource.resource;
instr.dsts[0].reg.idx[1].offset = semantic->resource.range.first;
instr.dsts[0].reg.idx[2].offset = semantic->resource.range.last;
instr.dsts[0].reg.idx_count = 3;
instr.idx[instr.idx_count++] = semantic->resource.range.space;
} }
else else
{ {
instr.dsts[0].reg.idx[0].offset = semantic->resource.range.first; instr.byte_stride = ins->declaration.structured_resource.byte_stride;
resource = &ins->declaration.structured_resource.resource;
}
instr.dsts[0] = resource->reg;
instr.dst_count = 1;
if (vkd3d_shader_ver_ge(version, 5, 1))
{
instr.dsts[0].reg.idx[0].offset = resource->reg.reg.idx[0].offset;
instr.dsts[0].reg.idx[1].offset = resource->range.first;
instr.dsts[0].reg.idx[2].offset = resource->range.last;
instr.dsts[0].reg.idx_count = 3;
instr.idx[instr.idx_count++] = resource->range.space;
}
else
{
instr.dsts[0].reg.idx[0].offset = resource->range.first;
instr.dsts[0].reg.idx_count = 1; instr.dsts[0].reg.idx_count = 1;
} }
@@ -3903,10 +3913,6 @@ static void tpf_dcl_texture(const struct tpf_compiler *tpf, const struct vkd3d_s
instr.extra_bits |= ins->flags << VKD3D_SM5_UAV_FLAGS_SHIFT; instr.extra_bits |= ins->flags << VKD3D_SM5_UAV_FLAGS_SHIFT;
instr.extra_bits |= (sm4_resource_dimension(ins->resource_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT); instr.extra_bits |= (sm4_resource_dimension(ins->resource_type) << VKD3D_SM4_RESOURCE_TYPE_SHIFT);
instr.extra_bits |= semantic->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT;
if (ins->structured)
instr.byte_stride = structured_resource->byte_stride;
write_sm4_instruction(tpf, &instr); write_sm4_instruction(tpf, &instr);
} }