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_static_sampler_desc structure to vkd3d_shader_static_sampler_desc.

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-21 15:19:59 +04:30 committed by Alexandre Julliard
parent 4bea4b82e9
commit 62113ff828
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/vkd3d_shader.h
View File

@ -401,7 +401,7 @@ enum vkd3d_shader_static_border_colour
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR),
}; };
struct vkd3d_static_sampler_desc struct vkd3d_shader_static_sampler_desc
{ {
enum vkd3d_shader_filter filter; enum vkd3d_shader_filter filter;
enum vkd3d_shader_texture_address_mode address_u; enum vkd3d_shader_texture_address_mode address_u;
@ -498,7 +498,7 @@ struct vkd3d_root_signature_desc
unsigned int parameter_count; unsigned int parameter_count;
const struct vkd3d_shader_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_shader_static_sampler_desc *static_samplers;
enum vkd3d_root_signature_flags flags; enum vkd3d_root_signature_flags flags;
}; };
@ -564,7 +564,7 @@ struct vkd3d_root_signature_desc1
unsigned int parameter_count; unsigned int parameter_count;
const struct vkd3d_root_parameter1 *parameters; const struct vkd3d_root_parameter1 *parameters;
unsigned int static_sampler_count; unsigned int static_sampler_count;
const struct vkd3d_static_sampler_desc *static_samplers; const struct vkd3d_shader_static_sampler_desc *static_samplers;
enum vkd3d_root_signature_flags flags; enum vkd3d_root_signature_flags flags;
}; };

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

@ -2528,7 +2528,7 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c
} }
static int shader_parse_static_samplers(struct root_signature_parser_context *context, static int shader_parse_static_samplers(struct root_signature_parser_context *context,
unsigned int offset, unsigned int count, struct vkd3d_static_sampler_desc *sampler_descs) unsigned int offset, unsigned int count, struct vkd3d_shader_static_sampler_desc *sampler_descs)
{ {
const char *ptr; const char *ptr;
unsigned int i; unsigned int i;
@ -2629,7 +2629,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size,
v_1_0->static_sampler_count = count; v_1_0->static_sampler_count = count;
if (v_1_0->static_sampler_count) if (v_1_0->static_sampler_count)
{ {
struct vkd3d_static_sampler_desc *samplers; struct vkd3d_shader_static_sampler_desc *samplers;
if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers)))) if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers))))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
v_1_0->static_samplers = samplers; v_1_0->static_samplers = samplers;
@ -2713,7 +2713,7 @@ static unsigned int versioned_root_signature_get_static_sampler_count(const stru
return desc->u.v_1_1.static_sampler_count; return desc->u.v_1_1.static_sampler_count;
} }
static const struct vkd3d_static_sampler_desc *versioned_root_signature_get_static_samplers( static const struct vkd3d_shader_static_sampler_desc *versioned_root_signature_get_static_samplers(
const struct vkd3d_versioned_root_signature_desc *desc) const struct vkd3d_versioned_root_signature_desc *desc)
{ {
if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0)
@ -2970,7 +2970,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co
static int shader_write_static_samplers(struct root_signature_writer_context *context, static int shader_write_static_samplers(struct root_signature_writer_context *context,
const struct vkd3d_versioned_root_signature_desc *desc) const struct vkd3d_versioned_root_signature_desc *desc)
{ {
const struct vkd3d_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); const struct vkd3d_shader_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc);
unsigned int i; unsigned int i;
for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i) for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i)
@ -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_static_sampler_desc *samplers = NULL;
struct vkd3d_shader_root_parameter *parameters = NULL; struct vkd3d_shader_root_parameter *parameters = NULL;
struct vkd3d_static_sampler_desc *samplers = NULL;
int ret; int ret;
if ((dst_desc->parameter_count = src_desc->parameter_count)) if ((dst_desc->parameter_count = src_desc->parameter_count))
@ -3385,7 +3385,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_
{ {
const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0;
struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1;
struct vkd3d_static_sampler_desc *samplers = NULL; struct vkd3d_shader_static_sampler_desc *samplers = NULL;
struct vkd3d_root_parameter1 *parameters = NULL; struct vkd3d_root_parameter1 *parameters = NULL;
int ret; int ret;