Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc61dc5..d7711b0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -428,7 +428,7 @@ enum vkd3d_shader_descriptor_range_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), };
-struct vkd3d_descriptor_range +struct vkd3d_shader_descriptor_range { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -440,7 +440,7 @@ struct vkd3d_descriptor_range struct vkd3d_root_descriptor_table { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range *descriptor_ranges; + const struct vkd3d_shader_descriptor_range *descriptor_ranges; };
struct vkd3d_root_constants diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6035aee..7692880 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2223,7 +2223,7 @@ struct root_signature_parser_context };
static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range *ranges) { const char *ptr; unsigned int i; @@ -2302,7 +2302,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context static int shader_parse_descriptor_table(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table *table) { - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int count; const char *ptr;
@@ -2809,7 +2809,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table *table) { - const struct vkd3d_descriptor_range *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i;
for (i = 0; i < table->descriptor_range_count; ++i) @@ -3044,7 +3044,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta
for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i];
if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3201,7 +3201,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_descriptor_range1 *ranges1; - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret;
@@ -3319,7 +3319,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { - const struct vkd3d_descriptor_range *ranges; + const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_descriptor_range1 *ranges1; unsigned int i, j; int ret;