=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: libs/vkd3d-shader: Introduce VKD3DSPR_INVALID.
Alexandre Julliard
julliard at winehq.org
Fri Apr 13 12:16:53 CDT 2018
Module: vkd3d
Branch: master
Commit: 83ce4553ea2bf08e2957b7ab2eb6833d93dbf377
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=83ce4553ea2bf08e2957b7ab2eb6833d93dbf377
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Apr 13 12:37:37 2018 +0200
libs/vkd3d-shader: Introduce VKD3DSPR_INVALID.
Fixes clang warnings.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/dxbc.c | 4 ++--
libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 0b5c3cf..5f87eae 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -1378,8 +1378,8 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr
token = *(*ptr)++;
register_type = (token & VKD3D_SM4_REGISTER_TYPE_MASK) >> VKD3D_SM4_REGISTER_TYPE_SHIFT;
- if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)
- || register_type_table[register_type] == ~0u)
+ if (register_type >= ARRAY_SIZE(register_type_table)
+ || register_type_table[register_type] == VKD3DSPR_INVALID)
{
FIXME("Unhandled register type %#x.\n", register_type);
param->type = VKD3DSPR_TEMP;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 04e6b09..09c2e1d 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -352,6 +352,8 @@ enum vkd3d_shader_register_type
VKD3DSPR_COVERAGE,
VKD3DSPR_SAMPLEMASK,
VKD3DSPR_GSINSTID,
+
+ VKD3DSPR_INVALID = ~0u,
};
enum vkd3d_shader_resource_type
More information about the wine-cvs
mailing list