wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants.

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:45 +04:30
committed by Alexandre Julliard
parent 36d2127765
commit 270b31a7db
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/vkd3d_shader.h
View File

@@ -443,7 +443,7 @@ struct vkd3d_shader_root_descriptor_table
const struct vkd3d_shader_descriptor_range *descriptor_ranges; const struct vkd3d_shader_descriptor_range *descriptor_ranges;
}; };
struct vkd3d_root_constants struct vkd3d_shader_root_constants
{ {
unsigned int shader_register; unsigned int shader_register;
unsigned int register_space; unsigned int register_space;
@@ -473,7 +473,7 @@ struct vkd3d_root_parameter
union union
{ {
struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_shader_root_descriptor_table descriptor_table;
struct vkd3d_root_constants constants; struct vkd3d_shader_root_constants constants;
struct vkd3d_root_descriptor descriptor; struct vkd3d_root_descriptor descriptor;
} u; } u;
enum vkd3d_shader_visibility shader_visibility; enum vkd3d_shader_visibility shader_visibility;
@@ -553,7 +553,7 @@ struct vkd3d_root_parameter1
union union
{ {
struct vkd3d_root_descriptor_table1 descriptor_table; struct vkd3d_root_descriptor_table1 descriptor_table;
struct vkd3d_root_constants constants; struct vkd3d_shader_root_constants constants;
struct vkd3d_root_descriptor1 descriptor; struct vkd3d_root_descriptor1 descriptor;
} u; } u;
enum vkd3d_shader_visibility shader_visibility; enum vkd3d_shader_visibility shader_visibility;

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

@@ -2354,7 +2354,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context *
} }
static int shader_parse_root_constants(struct root_signature_parser_context *context, static int shader_parse_root_constants(struct root_signature_parser_context *context,
unsigned int offset, struct vkd3d_root_constants *constants) unsigned int offset, struct vkd3d_shader_root_constants *constants)
{ {
const char *ptr; const char *ptr;
@@ -2696,7 +2696,7 @@ static enum vkd3d_shader_visibility versioned_root_signature_get_parameter_shade
return desc->u.v_1_1.parameters[i].shader_visibility; return desc->u.v_1_1.parameters[i].shader_visibility;
} }
static const struct vkd3d_root_constants *versioned_root_signature_get_root_constants( static const struct vkd3d_shader_root_constants *versioned_root_signature_get_root_constants(
const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i)
{ {
if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0)
@@ -2877,7 +2877,7 @@ static int shader_write_descriptor_table1(struct root_signature_writer_context *
} }
static int shader_write_root_constants(struct root_signature_writer_context *context, static int shader_write_root_constants(struct root_signature_writer_context *context,
const struct vkd3d_root_constants *constants) const struct vkd3d_shader_root_constants *constants)
{ {
if (!write_dword(context, constants->shader_register)) if (!write_dword(context, constants->shader_register))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;