wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Allocate semantic registers for patch variables.

Browse Source
This commit is contained in:
Shaun Ren
2025-01-29 19:00:17 -05:00
committed by Henri Verbeet
parent 2ddbc69f1a
commit 2a1e3b100b
Notes: Henri Verbeet 2025-02-03 16:40:17 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Elizabeth Figura (@zfigura)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1362
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5824,6 +5824,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
[VKD3D_SHADER_TYPE_COMPUTE] = "Compute", [VKD3D_SHADER_TYPE_COMPUTE] = "Compute",
}; };
bool is_patch = hlsl_type_is_patch_array(var->data_type);
enum vkd3d_shader_register_type type; enum vkd3d_shader_register_type type;
struct vkd3d_shader_version version; struct vkd3d_shader_version version;
bool special_interpolation = false; bool special_interpolation = false;
@ -5864,7 +5865,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
bool has_idx; bool has_idx;
if (!sm4_sysval_semantic_from_semantic_name(&semantic, &version, ctx->semantic_compat_mapping, ctx->domain, if (!sm4_sysval_semantic_from_semantic_name(&semantic, &version, ctx->semantic_compat_mapping, ctx->domain,
var->semantic.name, var->semantic.index, output, ctx->is_patch_constant_func, false)) var->semantic.name, var->semantic.index, output, ctx->is_patch_constant_func, is_patch))
{ {
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
"Invalid semantic '%s'.", var->semantic.name); "Invalid semantic '%s'.", var->semantic.name);
@ -5897,15 +5898,17 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
} }
else else
{ {
unsigned int component_count = is_patch
? var->data_type->e.array.type->e.numeric.dimx : var->data_type->e.numeric.dimx;
int mode = (ctx->profile->major_version < 4) int mode = (ctx->profile->major_version < 4)
? 0 : sm4_get_interpolation_mode(var->data_type, var->storage_modifiers); ? 0 : sm4_get_interpolation_mode(var->data_type, var->storage_modifiers);
unsigned int reg_size = optimize ? var->data_type->e.numeric.dimx : 4; unsigned int reg_size = optimize ? component_count : 4;
if (special_interpolation) if (special_interpolation)
mode = VKD3DSIM_NONE; mode = VKD3DSIM_NONE;
var->regs[HLSL_REGSET_NUMERIC] = allocate_register(ctx, allocator, 1, UINT_MAX, var->regs[HLSL_REGSET_NUMERIC] = allocate_register(ctx, allocator, 1, UINT_MAX,
reg_size, var->data_type->e.numeric.dimx, mode, var->force_align, vip_allocation); reg_size, component_count, mode, var->force_align, vip_allocation);
TRACE("Allocated %s to %s (mode %d).\n", var->name, debug_register(output ? 'o' : 'v', TRACE("Allocated %s to %s (mode %d).\n", var->name, debug_register(output ? 'o' : 'v',
var->regs[HLSL_REGSET_NUMERIC], var->data_type), mode); var->regs[HLSL_REGSET_NUMERIC], var->data_type), mode);
@ -5914,6 +5917,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
static void allocate_semantic_registers(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) static void allocate_semantic_registers(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func)
{ {
struct register_allocator in_patch_allocator = {0}, patch_constant_out_patch_allocator = {0};
struct register_allocator input_allocator = {0}, output_allocator = {0}; struct register_allocator input_allocator = {0}, output_allocator = {0};
bool is_vertex_shader = ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX; bool is_vertex_shader = ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX;
bool is_pixel_shader = ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL; bool is_pixel_shader = ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL;
@ -5927,7 +5931,17 @@ static void allocate_semantic_registers(struct hlsl_ctx *ctx, struct hlsl_ir_fun
if (var->is_input_semantic) if (var->is_input_semantic)
{ {
if (hlsl_type_is_patch_array(var->data_type)) if (hlsl_type_is_patch_array(var->data_type))
hlsl_fixme(ctx, &var->loc, "Allocating registers for patch semantic variables."); {
bool is_patch_constant_output_patch = ctx->is_patch_constant_func &&
var->data_type->e.array.array_type == HLSL_ARRAY_PATCH_OUTPUT;
if (is_patch_constant_output_patch)
allocate_semantic_register(ctx, var, &patch_constant_out_patch_allocator, false,
!is_vertex_shader);
else
allocate_semantic_register(ctx, var, &in_patch_allocator, false,
!is_vertex_shader);
}
else else
allocate_semantic_register(ctx, var, &input_allocator, false, !is_vertex_shader); allocate_semantic_register(ctx, var, &input_allocator, false, !is_vertex_shader);
} }