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

vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1. 

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-14 15:52:53 +04:30 committed by Alexandre Julliard
parent de76e7c0b5
commit 6b0eb46716
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vkd3d_shader.h
View File

@ -522,7 +522,7 @@ enum vkd3d_shader_descriptor_range_flags
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS),
}; };
struct vkd3d_descriptor_range1 struct vkd3d_shader_descriptor_range1
{ {
enum vkd3d_shader_descriptor_range_type range_type; enum vkd3d_shader_descriptor_range_type range_type;
unsigned int descriptor_count; unsigned int descriptor_count;
@ -535,7 +535,7 @@ struct vkd3d_descriptor_range1
struct vkd3d_root_descriptor_table1 struct vkd3d_root_descriptor_table1
{ {
unsigned int descriptor_range_count; unsigned int descriptor_range_count;
const struct vkd3d_descriptor_range1 *descriptor_ranges; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges;
}; };
struct vkd3d_root_descriptor1 struct vkd3d_root_descriptor1

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

@ -2253,7 +2253,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context *
return VKD3D_OK; return VKD3D_OK;
} }
static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) static void shader_validate_descriptor_range1(const struct vkd3d_shader_descriptor_range1 *range)
{ {
unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE
| VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE
@ -2266,7 +2266,7 @@ static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_rang
} }
static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context,
unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range1 *ranges)
{ {
const char *ptr; const char *ptr;
unsigned int i; unsigned int i;
@ -2329,7 +2329,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c
static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, static int shader_parse_descriptor_table1(struct root_signature_parser_context *context,
unsigned int offset, struct vkd3d_root_descriptor_table1 *table) unsigned int offset, struct vkd3d_root_descriptor_table1 *table)
{ {
struct vkd3d_descriptor_range1 *ranges; struct vkd3d_shader_descriptor_range1 *ranges;
unsigned int count; unsigned int count;
const char *ptr; const char *ptr;
@ -2832,7 +2832,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context *
static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context,
const struct vkd3d_root_descriptor_table1 *table) const struct vkd3d_root_descriptor_table1 *table)
{ {
const struct vkd3d_descriptor_range1 *ranges = table->descriptor_ranges; const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges;
unsigned int i; unsigned int i;
for (i = 0; i < table->descriptor_range_count; ++i) for (i = 0; i < table->descriptor_range_count; ++i)
@ -3080,7 +3080,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta
for (i = 0; i < descriptor_table->descriptor_range_count; ++i) for (i = 0; i < descriptor_table->descriptor_range_count; ++i)
{ {
const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i];
if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV 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_UAV
@ -3200,7 +3200,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters
static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, 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_root_parameter1 *src, unsigned int count)
{ {
const struct vkd3d_descriptor_range1 *ranges1; const struct vkd3d_shader_descriptor_range1 *ranges1;
struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_shader_descriptor_range *ranges;
unsigned int i, j; unsigned int i, j;
int ret; int ret;
@ -3320,7 +3320,7 @@ 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_root_parameter *src, unsigned int count)
{ {
const struct vkd3d_shader_descriptor_range *ranges; const struct vkd3d_shader_descriptor_range *ranges;
struct vkd3d_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range1 *ranges1;
unsigned int i, j; unsigned int i, j;
int ret; int ret;