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_descriptor1 structure to vkd3d_shader_root_descriptor1.

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

4
include/vkd3d_shader.h
View File

@ -540,7 +540,7 @@ struct vkd3d_shader_root_descriptor_table1
const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges;
}; };
struct vkd3d_root_descriptor1 struct vkd3d_shader_root_descriptor1
{ {
unsigned int shader_register; unsigned int shader_register;
unsigned int register_space; unsigned int register_space;
@ -554,7 +554,7 @@ struct vkd3d_root_parameter1
{ {
struct vkd3d_shader_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_shader_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

@ -2396,7 +2396,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co
return VKD3D_OK; return VKD3D_OK;
} }
static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) static void shader_validate_root_descriptor1(const struct vkd3d_shader_root_descriptor1 *descriptor)
{ {
unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE
| VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE
@ -2408,7 +2408,7 @@ static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1
} }
static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, static int shader_parse_root_descriptor1(struct root_signature_parser_context *context,
unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) unsigned int offset, struct vkd3d_shader_root_descriptor1 *descriptor)
{ {
const char *ptr; const char *ptr;
@ -2901,7 +2901,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co
} }
static int shader_write_root_descriptor1(struct root_signature_writer_context *context, static int shader_write_root_descriptor1(struct root_signature_writer_context *context,
const struct vkd3d_root_descriptor1 *descriptor) const struct vkd3d_shader_root_descriptor1 *descriptor)
{ {
if (!write_dword(context, descriptor->shader_register)) if (!write_dword(context, descriptor->shader_register))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;