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

vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1. 

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-17 14:14:23 +04:30 committed by Alexandre Julliard
parent 0e9f914197
commit cb9bf177e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vkd3d_shader.h
View File

@ -534,7 +534,7 @@ struct vkd3d_shader_descriptor_range1
unsigned int descriptor_table_offset; unsigned int descriptor_table_offset;
}; };
struct vkd3d_root_descriptor_table1 struct vkd3d_shader_root_descriptor_table1
{ {
unsigned int descriptor_range_count; unsigned int descriptor_range_count;
const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges;
@ -552,7 +552,7 @@ struct vkd3d_root_parameter1
enum vkd3d_shader_root_parameter_type parameter_type; enum vkd3d_shader_root_parameter_type parameter_type;
union union
{ {
struct vkd3d_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_descriptor_table1 descriptor_table;
struct vkd3d_shader_root_constants constants; struct vkd3d_shader_root_constants constants;
struct vkd3d_root_descriptor1 descriptor; struct vkd3d_root_descriptor1 descriptor;
} u; } u;

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

@ -2327,7 +2327,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_shader_root_descriptor_table1 *table)
{ {
struct vkd3d_shader_descriptor_range1 *ranges; struct vkd3d_shader_descriptor_range1 *ranges;
unsigned int count; unsigned int count;
@ -2830,7 +2830,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_shader_root_descriptor_table1 *table)
{ {
const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges;
unsigned int i; unsigned int i;
@ -2866,7 +2866,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c
} }
static int shader_write_descriptor_table1(struct root_signature_writer_context *context, static int shader_write_descriptor_table1(struct root_signature_writer_context *context,
const struct vkd3d_root_descriptor_table1 *table) const struct vkd3d_shader_root_descriptor_table1 *table)
{ {
if (!write_dword(context, table->descriptor_range_count)) if (!write_dword(context, table->descriptor_range_count))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
@ -3072,7 +3072,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri
return VKD3D_OK; return VKD3D_OK;
} }
static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table) static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table)
{ {
bool have_srv_uav_cbv = false; bool have_srv_uav_cbv = false;
bool have_sampler = false; bool have_sampler = false;