wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table.

Browse Source 
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-16 14:38:44 +04:30 committed by Alexandre Julliard
parent 8b397eec88
commit 36d2127765
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

@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range
unsigned int descriptor_table_offset; unsigned int descriptor_table_offset;
}; };
struct vkd3d_root_descriptor_table struct vkd3d_shader_root_descriptor_table
{ {
unsigned int descriptor_range_count; unsigned int descriptor_range_count;
const struct vkd3d_shader_descriptor_range *descriptor_ranges; const struct vkd3d_shader_descriptor_range *descriptor_ranges;
@ -472,7 +472,7 @@ struct vkd3d_root_parameter
enum vkd3d_shader_root_parameter_type parameter_type; enum vkd3d_shader_root_parameter_type parameter_type;
union union
{ {
struct vkd3d_root_descriptor_table descriptor_table; struct vkd3d_shader_root_descriptor_table descriptor_table;
struct vkd3d_root_constants constants; struct vkd3d_root_constants constants;
struct vkd3d_root_descriptor descriptor; struct vkd3d_root_descriptor descriptor;
} u; } u;

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

@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context
} }
static int shader_parse_descriptor_table(struct root_signature_parser_context *context, static int shader_parse_descriptor_table(struct root_signature_parser_context *context,
unsigned int offset, struct vkd3d_root_descriptor_table *table) unsigned int offset, struct vkd3d_shader_root_descriptor_table *table)
{ {
struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_shader_descriptor_range *ranges;
unsigned int count; unsigned int count;
@ -2807,7 +2807,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, static int shader_write_descriptor_ranges(struct root_signature_writer_context *context,
const struct vkd3d_root_descriptor_table *table) const struct vkd3d_shader_root_descriptor_table *table)
{ {
const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges;
unsigned int i; unsigned int i;
@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context
} }
static int shader_write_descriptor_table(struct root_signature_writer_context *context, static int shader_write_descriptor_table(struct root_signature_writer_context *context,
const struct vkd3d_root_descriptor_table *table) const struct vkd3d_shader_root_descriptor_table *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;
@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con
return shader_write_static_samplers(context, desc); return shader_write_static_samplers(context, desc);
} }
static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table)
{ {
bool have_srv_uav_cbv = false; bool have_srv_uav_cbv = false;
bool have_sampler = false; bool have_sampler = false;