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/tpf: Store the "addressing" token as a uint32_t in shader_sm4_read_param().

Browse Source
This commit is contained in:
Henri Verbeet
2024-01-10 17:05:39 +01:00
committed by Alexandre Julliard
parent b1c538e0fe
commit c5facd4e03
Notes: Alexandre Julliard 2024-01-15 23:03:23 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/563
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1759,11 +1759,11 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui
const struct vkd3d_sm4_register_type_info *register_type_info; const struct vkd3d_sm4_register_type_info *register_type_info;
enum vkd3d_shader_register_type vsir_register_type; enum vkd3d_shader_register_type vsir_register_type;
enum vkd3d_sm4_register_precision precision; enum vkd3d_sm4_register_precision precision;
uint32_t token, order, extended, addressing;
enum vkd3d_sm4_register_type register_type; enum vkd3d_sm4_register_type register_type;
enum vkd3d_sm4_extended_operand_type type; enum vkd3d_sm4_extended_operand_type type;
enum vkd3d_sm4_register_modifier m;
enum vkd3d_sm4_dimension sm4_dimension; enum vkd3d_sm4_dimension sm4_dimension;
uint32_t token, order, extended; enum vkd3d_sm4_register_modifier m;
if (*ptr >= end) if (*ptr >= end)
{ {
@ -1861,7 +1861,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui
if (order >= 1) if (order >= 1)
{ {
DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK0) >> VKD3D_SM4_ADDRESSING_SHIFT0; addressing = (token & VKD3D_SM4_ADDRESSING_MASK0) >> VKD3D_SM4_ADDRESSING_SHIFT0;
if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[0]))) if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[0])))
{ {
ERR("Failed to read register index.\n"); ERR("Failed to read register index.\n");
@ -1871,7 +1871,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui
if (order >= 2) if (order >= 2)
{ {
DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK1) >> VKD3D_SM4_ADDRESSING_SHIFT1; addressing = (token & VKD3D_SM4_ADDRESSING_MASK1) >> VKD3D_SM4_ADDRESSING_SHIFT1;
if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[1]))) if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[1])))
{ {
ERR("Failed to read register index.\n"); ERR("Failed to read register index.\n");
@ -1881,7 +1881,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui
if (order >= 3) if (order >= 3)
{ {
DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK2) >> VKD3D_SM4_ADDRESSING_SHIFT2; addressing = (token & VKD3D_SM4_ADDRESSING_MASK2) >> VKD3D_SM4_ADDRESSING_SHIFT2;
if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[2]))) if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[2])))
{ {
ERR("Failed to read register index.\n"); ERR("Failed to read register index.\n");