Henri Verbeet : vkd3d-shader: Rename the vkd3d_texture_address_mode enumeration to vkd3d_shader_texture_address_mode.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: e5c77186679c6d934c7cf181ee1ac252fa39a457
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=e5c77186679c6d934c7cf181...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Jul 16 14:56:48 2020 +0430

vkd3d-shader: Rename the vkd3d_texture_address_mode enumeration to vkd3d_shader_texture_address_mode.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/vkd3d_shader.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 2ae35ae..20f9678 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -367,15 +367,15 @@ enum vkd3d_shader_filter
     VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER),
 };
 
-enum vkd3d_texture_address_mode
+enum vkd3d_shader_texture_address_mode
 {
-    VKD3D_TEXTURE_ADDRESS_MODE_WRAP = 1,
-    VKD3D_TEXTURE_ADDRESS_MODE_MIRROR = 2,
-    VKD3D_TEXTURE_ADDRESS_MODE_CLAMP = 3,
-    VKD3D_TEXTURE_ADDRESS_MODE_BORDER = 4,
-    VKD3D_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 5,
+    VKD3D_SHADER_TEXTURE_ADDRESS_MODE_WRAP        = 0x1,
+    VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR      = 0x2,
+    VKD3D_SHADER_TEXTURE_ADDRESS_MODE_CLAMP       = 0x3,
+    VKD3D_SHADER_TEXTURE_ADDRESS_MODE_BORDER      = 0x4,
+    VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 0x5,
 
-    VKD3D_FORCE_32_BIT_ENUM(VKD3D_TEXTURE_ADDRESS_MODE),
+    VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE),
 };
 
 enum vkd3d_comparison_func
@@ -404,9 +404,9 @@ enum vkd3d_static_border_color
 struct vkd3d_static_sampler_desc
 {
     enum vkd3d_shader_filter filter;
-    enum vkd3d_texture_address_mode address_u;
-    enum vkd3d_texture_address_mode address_v;
-    enum vkd3d_texture_address_mode address_w;
+    enum vkd3d_shader_texture_address_mode address_u;
+    enum vkd3d_shader_texture_address_mode address_v;
+    enum vkd3d_shader_texture_address_mode address_w;
     float mip_lod_bias;
     unsigned int max_anisotropy;
     enum vkd3d_comparison_func comparison_func;