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: Add valid vkd3d_sm4_data_type types.

Browse Source 
Signed-off-by: Isabella Bosia <ibosia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Isabella Bosia 2020-09-26 01:05:36 +01:00 committed by Alexandre Julliard
parent cbe4a3adff
commit 8d9d20d47b
3 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/vkd3d-shader/dxbc.c
View File

@ -433,11 +433,15 @@ enum vkd3d_sm4_resource_type
enum vkd3d_sm4_data_type enum vkd3d_sm4_data_type
{ {
VKD3D_SM4_DATA_UNORM = 0x1, VKD3D_SM4_DATA_UNORM = 0x1,
VKD3D_SM4_DATA_SNORM = 0x2, VKD3D_SM4_DATA_SNORM = 0x2,
VKD3D_SM4_DATA_INT = 0x3, VKD3D_SM4_DATA_INT = 0x3,
VKD3D_SM4_DATA_UINT = 0x4, VKD3D_SM4_DATA_UINT = 0x4,
VKD3D_SM4_DATA_FLOAT = 0x5, VKD3D_SM4_DATA_FLOAT = 0x5,
VKD3D_SM4_DATA_MIXED = 0x6,
VKD3D_SM4_DATA_DOUBLE = 0x7,
VKD3D_SM4_DATA_CONTINUED = 0x8,
VKD3D_SM4_DATA_UNUSED = 0x9,
}; };
enum vkd3d_sm4_sampler_mode enum vkd3d_sm4_sampler_mode
@ -522,12 +526,16 @@ static const enum vkd3d_shader_resource_type resource_type_table[] =
static const enum vkd3d_data_type data_type_table[] = static const enum vkd3d_data_type data_type_table[] =
{ {
/* 0 */ VKD3D_DATA_FLOAT, /* 0 */ VKD3D_DATA_FLOAT,
/* VKD3D_SM4_DATA_UNORM */ VKD3D_DATA_UNORM, /* VKD3D_SM4_DATA_UNORM */ VKD3D_DATA_UNORM,
/* VKD3D_SM4_DATA_SNORM */ VKD3D_DATA_SNORM, /* VKD3D_SM4_DATA_SNORM */ VKD3D_DATA_SNORM,
/* VKD3D_SM4_DATA_INT */ VKD3D_DATA_INT, /* VKD3D_SM4_DATA_INT */ VKD3D_DATA_INT,
/* VKD3D_SM4_DATA_UINT */ VKD3D_DATA_UINT, /* VKD3D_SM4_DATA_UINT */ VKD3D_DATA_UINT,
/* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT, /* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT,
/* VKD3D_SM4_DATA_MIXED */ VKD3D_DATA_MIXED,
/* VKD3D_SM4_DATA_DOUBLE */ VKD3D_DATA_DOUBLE,
/* VKD3D_SM4_DATA_CONTINUED */ VKD3D_DATA_CONTINUED,
/* VKD3D_SM4_DATA_UNUSED */ VKD3D_DATA_UNUSED,
}; };
static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv)

22
libs/vkd3d-shader/trace.c
View File

@ -530,15 +530,19 @@ static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d
{ {
static const char *const data_type_names[] = static const char *const data_type_names[] =
{ {
/* VKD3D_DATA_FLOAT */ "float", /* VKD3D_DATA_FLOAT */ "float",
/* VKD3D_DATA_INT */ "int", /* VKD3D_DATA_INT */ "int",
/* VKD3D_DATA_RESOURCE */ "resource", /* VKD3D_DATA_RESOURCE */ "resource",
/* VKD3D_DATA_SAMPLER */ "sampler", /* VKD3D_DATA_SAMPLER */ "sampler",
/* VKD3D_DATA_UAV */ "uav", /* VKD3D_DATA_UAV */ "uav",
/* VKD3D_DATA_UINT */ "uint", /* VKD3D_DATA_UINT */ "uint",
/* VKD3D_DATA_UNORM */ "unorm", /* VKD3D_DATA_UNORM */ "unorm",
/* VKD3D_DATA_SNORM */ "snorm", /* VKD3D_DATA_SNORM */ "snorm",
/* VKD3D_DATA_OPAQUE */ "opaque", /* VKD3D_DATA_OPAQUE */ "opaque",
/* VKD3D_DATA_MIXED */ "mixed",
/* VKD3D_DATA_DOUBLE */ "double",
/* VKD3D_DATA_CONTINUED */ "<continued>",
/* VKD3D_DATA_UNUSED */ "<unused>",
}; };
const char *name; const char *name;

4
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -394,6 +394,10 @@ enum vkd3d_data_type
VKD3D_DATA_UNORM, VKD3D_DATA_UNORM,
VKD3D_DATA_SNORM, VKD3D_DATA_SNORM,
VKD3D_DATA_OPAQUE, VKD3D_DATA_OPAQUE,
VKD3D_DATA_MIXED,
VKD3D_DATA_DOUBLE,
VKD3D_DATA_CONTINUED,
VKD3D_DATA_UNUSED,
}; };
enum vkd3d_immconst_type enum vkd3d_immconst_type