From f163df787ea23e50c470101bb38551cacd16cf7e Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 13 Aug 2024 21:43:30 +0200 Subject: [PATCH] vkd3d-shader/d3dbc: Avoid D3DVS_VERSION and D3DPS_VERSION. --- libs/vkd3d-shader/d3dbc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index de5f28c1..37683378 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1481,10 +1481,8 @@ struct d3dbc_compiler static uint32_t sm1_version(enum vkd3d_shader_type type, unsigned int major, unsigned int minor) { - if (type == VKD3D_SHADER_TYPE_VERTEX) - return D3DVS_VERSION(major, minor); - else - return D3DPS_VERSION(major, minor); + return vkd3d_make_u32(vkd3d_make_u16(minor, major), + type == VKD3D_SHADER_TYPE_VERTEX ? VKD3D_SM1_VS : VKD3D_SM1_PS); } D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type)