mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_descriptor_range_type enumeration to vkd3d_shader_descriptor_range_type. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-07-10 16:44:03 +04:30 committed by Alexandre Julliard
parent edd585ea44
commit 6e0ab34564
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/vkd3d_shader.h
View File

@ -418,19 +418,19 @@ struct vkd3d_static_sampler_desc
enum vkd3d_shader_visibility shader_visibility;
};
enum vkd3d_descriptor_range_type
enum vkd3d_shader_descriptor_range_type
{
VKD3D_DESCRIPTOR_RANGE_TYPE_SRV = 0,
VKD3D_DESCRIPTOR_RANGE_TYPE_UAV = 1,
VKD3D_DESCRIPTOR_RANGE_TYPE_CBV = 2,
VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER = 3,
VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV = 0x0,
VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV = 0x1,
VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV = 0x2,
VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER = 0x3,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_DESCRIPTOR_RANGE_TYPE),
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE),
};
struct vkd3d_descriptor_range
{
enum vkd3d_descriptor_range_type range_type;
enum vkd3d_shader_descriptor_range_type range_type;
unsigned int descriptor_count;
unsigned int base_shader_register;
unsigned int register_space;
@ -522,7 +522,7 @@ enum vkd3d_descriptor_range_flags
struct vkd3d_descriptor_range1
{
enum vkd3d_descriptor_range_type range_type;
enum vkd3d_shader_descriptor_range_type range_type;
unsigned int descriptor_count;
unsigned int base_shader_register;
unsigned int register_space;

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

@ -3046,13 +3046,13 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta
{
const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i];
if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV
|| r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV
|| r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV)
if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV
|| r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV
|| r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV)
{
have_srv_uav_cbv = true;
}
else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER)
else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER)
{
have_sampler = true;
}
@ -3082,13 +3082,13 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta
{
const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i];
if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV
|| r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV
|| r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV)
if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV
|| r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV
|| r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_CBV)
{
have_srv_uav_cbv = true;
}
else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER)
else if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SAMPLER)
{
have_sampler = true;
}