Henri Verbeet : vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour.
Alexandre Julliard
julliard at winehq.org
Fri Jul 17 16:29:29 CDT 2020
Module: vkd3d
Branch: master
Commit: 0e9f91419773b4ca3721e67293326b21d3663a9e
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e9f91419773b4ca3721e67293326b21d3663a9e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jul 17 14:32:22 2020 +0430
vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/vkd3d_shader.h | 12 ++++++------
libs/vkd3d-shader/dxbc.c | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index d6f4aea..cbc4562 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -392,13 +392,13 @@ enum vkd3d_shader_comparison_func
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC),
};
-enum vkd3d_static_border_color
+enum vkd3d_shader_static_border_colour
{
- VKD3D_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0,
- VKD3D_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1,
- VKD3D_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2,
+ VKD3D_SHADER_STATIC_BORDER_COLOUR_TRANSPARENT_BLACK = 0x0,
+ VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_BLACK = 0x1,
+ VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_WHITE = 0x2,
- VKD3D_FORCE_32_BIT_ENUM(VKD3D_STATIC_BORDER_COLOR),
+ VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR),
};
struct vkd3d_static_sampler_desc
@@ -410,7 +410,7 @@ struct vkd3d_static_sampler_desc
float mip_lod_bias;
unsigned int max_anisotropy;
enum vkd3d_shader_comparison_func comparison_func;
- enum vkd3d_static_border_color border_color;
+ enum vkd3d_shader_static_border_colour border_colour;
float min_lod;
float max_lod;
unsigned int shader_register;
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 1fb8dc8..4f19b85 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2549,7 +2549,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co
read_float(&ptr, &sampler_descs[i].mip_lod_bias);
read_dword(&ptr, &sampler_descs[i].max_anisotropy);
read_dword(&ptr, &sampler_descs[i].comparison_func);
- read_dword(&ptr, &sampler_descs[i].border_color);
+ read_dword(&ptr, &sampler_descs[i].border_colour);
read_float(&ptr, &sampler_descs[i].min_lod);
read_float(&ptr, &sampler_descs[i].max_lod);
read_dword(&ptr, &sampler_descs[i].shader_register);
@@ -2989,7 +2989,7 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co
return VKD3D_ERROR_OUT_OF_MEMORY;
if (!write_dword(context, samplers[i].comparison_func))
return VKD3D_ERROR_OUT_OF_MEMORY;
- if (!write_dword(context, samplers[i].border_color))
+ if (!write_dword(context, samplers[i].border_colour))
return VKD3D_ERROR_OUT_OF_MEMORY;
if (!write_float(context, samplers[i].min_lod))
return VKD3D_ERROR_OUT_OF_MEMORY;
More information about the wine-cvs
mailing list