From 6e0ab34564fdd3e9690ff809d4a20dd182fd4522 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 10 Jul 2020 16:44:03 +0430 Subject: [PATCH] vkd3d-shader: Rename the vkd3d_descriptor_range_type enumeration to vkd3d_shader_descriptor_range_type. Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- include/vkd3d_shader.h | 16 ++++++++-------- libs/vkd3d-shader/dxbc.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d00ec455..50c64cad 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -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; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5fba83b6..a0f03cf3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -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; }