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: Calculate register size for SM4.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-06-23 23:57:34 -05:00 committed by Alexandre Julliard
parent 5a8c89566f
commit f7bf1dc01c
2 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libs/vkd3d-shader/hlsl.c
View File

@ -112,23 +112,35 @@ static unsigned int get_array_size(const struct hlsl_type *type)
return 1; return 1;
} }
static void hlsl_type_calculate_reg_size(struct hlsl_type *type) static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type *type)
{ {
bool is_sm4 = (ctx->profile->major_version >= 4);
switch (type->type) switch (type->type)
{ {
case HLSL_CLASS_SCALAR: case HLSL_CLASS_SCALAR:
case HLSL_CLASS_VECTOR: case HLSL_CLASS_VECTOR:
type->reg_size = 4; type->reg_size = is_sm4 ? type->dimx : 4;
break; break;
case HLSL_CLASS_MATRIX: case HLSL_CLASS_MATRIX:
type->reg_size = 4 * (hlsl_type_is_row_major(type) ? type->dimy : type->dimx); if (hlsl_type_is_row_major(type))
type->reg_size = is_sm4 ? (4 * (type->dimy - 1) + type->dimx) : (4 * type->dimy);
else
type->reg_size = is_sm4 ? (4 * (type->dimx - 1) + type->dimy) : (4 * type->dimx);
break; break;
case HLSL_CLASS_ARRAY: case HLSL_CLASS_ARRAY:
assert(type->e.array.type->reg_size); {
type->reg_size = type->e.array.elements_count * type->e.array.type->reg_size; unsigned int element_size = type->e.array.type->reg_size;
assert(element_size);
if (is_sm4)
type->reg_size = (type->e.array.elements_count - 1) * align(element_size, 4) + element_size;
else
type->reg_size = type->e.array.elements_count * element_size;
break; break;
}
case HLSL_CLASS_STRUCT: case HLSL_CLASS_STRUCT:
{ {
@ -139,11 +151,22 @@ static void hlsl_type_calculate_reg_size(struct hlsl_type *type)
LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry)
{ {
type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); unsigned int field_size = field->type->reg_size;
assert(field_size);
/* Align to the next vec4 boundary if:
* (a) the type is a struct or array type, or
* (b) the type would cross a vec4 boundary; i.e. a vec3 and a
* vec1 can be packed together, but not a vec3 and a vec2.
*/
if (field->type->type > HLSL_CLASS_LAST_NUMERIC || (type->reg_size & 3) + field_size > 4)
type->reg_size = align(type->reg_size, 4);
field->reg_offset = type->reg_size; field->reg_offset = type->reg_size;
assert(field->type->reg_size); type->reg_size += field_size;
type->reg_size += field->type->reg_size;
type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type);
} }
break; break;
} }
@ -165,7 +188,7 @@ struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hls
type->base_type = base_type; type->base_type = base_type;
type->dimx = dimx; type->dimx = dimx;
type->dimy = dimy; type->dimy = dimy;
hlsl_type_calculate_reg_size(type); hlsl_type_calculate_reg_size(ctx, type);
list_add_tail(&ctx->types, &type->entry); list_add_tail(&ctx->types, &type->entry);
@ -185,7 +208,7 @@ struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *ba
type->e.array.type = basic_type; type->e.array.type = basic_type;
type->dimx = basic_type->dimx; type->dimx = basic_type->dimx;
type->dimy = basic_type->dimy; type->dimy = basic_type->dimy;
hlsl_type_calculate_reg_size(type); hlsl_type_calculate_reg_size(ctx, type);
list_add_tail(&ctx->types, &type->entry); list_add_tail(&ctx->types, &type->entry);
@ -203,7 +226,7 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s
type->name = name; type->name = name;
type->dimy = 1; type->dimy = 1;
type->e.elements = fields; type->e.elements = fields;
hlsl_type_calculate_reg_size(type); hlsl_type_calculate_reg_size(ctx, type);
list_add_tail(&ctx->types, &type->entry); list_add_tail(&ctx->types, &type->entry);
@ -389,7 +412,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old,
break; break;
} }
hlsl_type_calculate_reg_size(type); hlsl_type_calculate_reg_size(ctx, type);
list_add_tail(&ctx->types, &type->entry); list_add_tail(&ctx->types, &type->entry);
return type; return type;

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

@ -737,9 +737,17 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv
static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type)
{ {
static const char writemask_offset[] = {'w','x','y','z'};
if (type->reg_size > 4) if (type->reg_size > 4)
{
if (type->reg_size & 3)
return vkd3d_dbg_sprintf("%c%u-%c%u.%c", class, reg.id, class,
reg.id + (type->reg_size / 4), writemask_offset[type->reg_size & 3]);
return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class,
reg.id + (type->reg_size / 4) - 1); reg.id + (type->reg_size / 4) - 1);
}
return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask));
} }