Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants.
Alexandre Julliard
julliard at winehq.org
Thu Jul 16 19:01:11 CDT 2020
Module: vkd3d
Branch: master
Commit: 270b31a7db0c3f7131f968eccd9fdfd9d7133031
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=270b31a7db0c3f7131f968eccd9fdfd9d7133031
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Jul 16 14:56:45 2020 +0430
vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/vkd3d_shader.h | 6 +++---
libs/vkd3d-shader/dxbc.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 6fa2505..0323766 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -443,7 +443,7 @@ struct vkd3d_shader_root_descriptor_table
const struct vkd3d_shader_descriptor_range *descriptor_ranges;
};
-struct vkd3d_root_constants
+struct vkd3d_shader_root_constants
{
unsigned int shader_register;
unsigned int register_space;
@@ -473,7 +473,7 @@ struct vkd3d_root_parameter
union
{
struct vkd3d_shader_root_descriptor_table descriptor_table;
- struct vkd3d_root_constants constants;
+ struct vkd3d_shader_root_constants constants;
struct vkd3d_root_descriptor descriptor;
} u;
enum vkd3d_shader_visibility shader_visibility;
@@ -553,7 +553,7 @@ struct vkd3d_root_parameter1
union
{
struct vkd3d_root_descriptor_table1 descriptor_table;
- struct vkd3d_root_constants constants;
+ struct vkd3d_shader_root_constants constants;
struct vkd3d_root_descriptor1 descriptor;
} u;
enum vkd3d_shader_visibility shader_visibility;
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 0848c04..a247d5c 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -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,
- unsigned int offset, struct vkd3d_root_constants *constants)
+ unsigned int offset, struct vkd3d_shader_root_constants *constants)
{
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;
}
-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)
{
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,
- const struct vkd3d_root_constants *constants)
+ const struct vkd3d_shader_root_constants *constants)
{
if (!write_dword(context, constants->shader_register))
return VKD3D_ERROR_OUT_OF_MEMORY;
More information about the wine-cvs
mailing list