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

vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter. 

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:25 +04:30 committed by Alexandre Julliard
parent f5e39842fa
commit 4bea4b82e9
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vkd3d_shader.h
View File

@ -467,7 +467,7 @@ enum vkd3d_shader_root_parameter_type
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE),
}; };
struct vkd3d_root_parameter struct vkd3d_shader_root_parameter
{ {
enum vkd3d_shader_root_parameter_type parameter_type; enum vkd3d_shader_root_parameter_type parameter_type;
union union
@ -496,7 +496,7 @@ enum vkd3d_root_signature_flags
struct vkd3d_root_signature_desc struct vkd3d_root_signature_desc
{ {
unsigned int parameter_count; unsigned int parameter_count;
const struct vkd3d_root_parameter *parameters; const struct vkd3d_shader_root_parameter *parameters;
unsigned int static_sampler_count; unsigned int static_sampler_count;
const struct vkd3d_static_sampler_desc *static_samplers; const struct vkd3d_static_sampler_desc *static_samplers;
enum vkd3d_root_signature_flags flags; enum vkd3d_root_signature_flags flags;

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

@ -2432,7 +2432,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c
} }
static int shader_parse_root_parameters(struct root_signature_parser_context *context, static int shader_parse_root_parameters(struct root_signature_parser_context *context,
unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) unsigned int offset, unsigned int count, struct vkd3d_shader_root_parameter *parameters)
{ {
const char *ptr; const char *ptr;
unsigned int i; unsigned int i;
@ -2596,7 +2596,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size,
v_1_0->parameter_count = count; v_1_0->parameter_count = count;
if (v_1_0->parameter_count) if (v_1_0->parameter_count)
{ {
struct vkd3d_root_parameter *parameters; struct vkd3d_shader_root_parameter *parameters;
if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters))))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
v_1_0->parameters = parameters; v_1_0->parameters = parameters;
@ -3181,7 +3181,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign
return VKD3D_OK; return VKD3D_OK;
} }
static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count)
{ {
unsigned int i; unsigned int i;
@ -3190,14 +3190,14 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
const struct vkd3d_root_parameter *p = &parameters[i]; const struct vkd3d_shader_root_parameter *p = &parameters[i];
if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE)
vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges);
} }
} }
static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst,
const struct vkd3d_root_parameter1 *src, unsigned int count) const struct vkd3d_root_parameter1 *src, unsigned int count)
{ {
const struct vkd3d_shader_descriptor_range1 *ranges1; const struct vkd3d_shader_descriptor_range1 *ranges1;
@ -3208,7 +3208,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst,
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
const struct vkd3d_root_parameter1 *p1 = &src[i]; const struct vkd3d_root_parameter1 *p1 = &src[i];
struct vkd3d_root_parameter *p = &dst[i]; struct vkd3d_shader_root_parameter *p = &dst[i];
p->parameter_type = p1->parameter_type; p->parameter_type = p1->parameter_type;
switch (p->parameter_type) switch (p->parameter_type)
@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_
{ {
const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1;
struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0;
struct vkd3d_shader_root_parameter *parameters = NULL;
struct vkd3d_static_sampler_desc *samplers = NULL; struct vkd3d_static_sampler_desc *samplers = NULL;
struct vkd3d_root_parameter *parameters = NULL;
int ret; int ret;
if ((dst_desc->parameter_count = src_desc->parameter_count)) if ((dst_desc->parameter_count = src_desc->parameter_count))
@ -3317,7 +3317,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete
} }
static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst,
const struct vkd3d_root_parameter *src, unsigned int count) const struct vkd3d_shader_root_parameter *src, unsigned int count)
{ {
const struct vkd3d_shader_descriptor_range *ranges; const struct vkd3d_shader_descriptor_range *ranges;
struct vkd3d_shader_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range1 *ranges1;
@ -3326,7 +3326,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst,
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
const struct vkd3d_root_parameter *p = &src[i]; const struct vkd3d_shader_root_parameter *p = &src[i];
struct vkd3d_root_parameter1 *p1 = &dst[i]; struct vkd3d_root_parameter1 *p1 = &dst[i];
p1->parameter_type = p->parameter_type; p1->parameter_type = p->parameter_type;

2
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -484,7 +484,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d
for (i = 0; i < root_signature->parameter_count; ++i) for (i = 0; i < root_signature->parameter_count; ++i)
{ {
const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; const struct vkd3d_shader_root_parameter *parameter = &root_signature->parameters[i];
if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE)
vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges);