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/fx: Don't use an array to write the type class.

Browse Source
This commit is contained in:
Zebediah Figura 2024-04-09 16:05:33 -05:00 committed by Alexandre Julliard
parent 285059ef11
commit 047040fc63
Notes: Alexandre Julliard 2024-04-11 17:04:58 -05:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/775
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/vkd3d-shader/fx.c
View File

@ -404,14 +404,6 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
uint32_t name_offset, offset, size, stride, numeric_desc; uint32_t name_offset, offset, size, stride, numeric_desc;
uint32_t elements_count = 0; uint32_t elements_count = 0;
const char *name; const char *name;
static const uint32_t variable_type[] =
{
[HLSL_CLASS_SCALAR] = 1,
[HLSL_CLASS_VECTOR] = 1,
[HLSL_CLASS_MATRIX] = 1,
[HLSL_CLASS_OBJECT] = 2,
[HLSL_CLASS_STRUCT] = 3,
};
struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ctx *ctx = fx->ctx;
/* Resolve arrays to element type and number of elements. */ /* Resolve arrays to element type and number of elements. */
@ -431,13 +423,19 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
case HLSL_CLASS_SCALAR: case HLSL_CLASS_SCALAR:
case HLSL_CLASS_VECTOR: case HLSL_CLASS_VECTOR:
case HLSL_CLASS_MATRIX: case HLSL_CLASS_MATRIX:
case HLSL_CLASS_OBJECT: put_u32_unaligned(buffer, 1);
case HLSL_CLASS_STRUCT:
put_u32_unaligned(buffer, variable_type[type->class]);
break; break;
default:
hlsl_fixme(ctx, &ctx->location, "Writing type class %u is not implemented.", type->class); case HLSL_CLASS_OBJECT:
return 0; put_u32_unaligned(buffer, 2);
break;
case HLSL_CLASS_STRUCT:
put_u32_unaligned(buffer, 3);
break;
case HLSL_CLASS_ARRAY:
vkd3d_unreachable();
} }
size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float); size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float);