[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_filter enumeration to vkd3d_shader_filter.

[Henri Verbeet]

Signed-off-by: Henri Verbeet 
---
 include/vkd3d_shader.h | 82 +++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index b2c3dc9..2ae35ae 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -325,46 +325,46 @@ struct vkd3d_shader_spirv_domain_shader_target_info
 };

/* root signature 1.0 */
-enum vkd3d_filter
-{
-    VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0,
-    VKD3D_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1,
-    VKD3D_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4,
-    VKD3D_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5,
-    VKD3D_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10,
-    VKD3D_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11,
-    VKD3D_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14,
-    VKD3D_FILTER_MIN_MAG_MIP_LINEAR = 0x15,
-    VKD3D_FILTER_ANISOTROPIC = 0x55,
-    VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80,
-    VKD3D_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81,
-    VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84,
-    VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85,
-    VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90,
-    VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91,
-    VKD3D_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94,
-    VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95,
-    VKD3D_FILTER_COMPARISON_ANISOTROPIC = 0xd5,
-    VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100,
-    VKD3D_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101,
-    VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104,
-    VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105,
-    VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110,
-    VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111,
-    VKD3D_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114,
-    VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115,
-    VKD3D_FILTER_MINIMUM_ANISOTROPIC = 0x155,
-    VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180,
-    VKD3D_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181,
-    VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184,
-    VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185,
-    VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190,
-    VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191,
-    VKD3D_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194,
-    VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195,
-    VKD3D_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5,
-
-    VKD3D_FORCE_32_BIT_ENUM(VKD3D_FILTER),
+enum vkd3d_shader_filter
+{
+    VKD3D_SHADER_FILTER_MIN_MAG_MIP_POINT                          = 0x000,
+    VKD3D_SHADER_FILTER_MIN_MAG_POINT_MIP_LINEAR                   = 0x001,
+    VKD3D_SHADER_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT             = 0x004,
+    VKD3D_SHADER_FILTER_MIN_POINT_MAG_MIP_LINEAR                   = 0x005,
+    VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_MIP_POINT                   = 0x010,
+    VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR            = 0x011,
+    VKD3D_SHADER_FILTER_MIN_MAG_LINEAR_MIP_POINT                   = 0x014,
+    VKD3D_SHADER_FILTER_MIN_MAG_MIP_LINEAR                         = 0x015,
+    VKD3D_SHADER_FILTER_ANISOTROPIC                                = 0x055,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_POINT               = 0x080,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR        = 0x081,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT  = 0x084,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR        = 0x085,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT        = 0x090,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x091,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT        = 0x094,
+    VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR              = 0x095,
+    VKD3D_SHADER_FILTER_COMPARISON_ANISOTROPIC                     = 0x0d5,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_POINT                  = 0x100,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR           = 0x101,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT     = 0x104,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR           = 0x105,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT           = 0x110,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR    = 0x111,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT           = 0x114,
+    VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR                 = 0x115,
+    VKD3D_SHADER_FILTER_MINIMUM_ANISOTROPIC                        = 0x155,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_POINT                  = 0x180,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR           = 0x181,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT     = 0x184,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR           = 0x185,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT           = 0x190,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR    = 0x191,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT           = 0x194,
+    VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR                 = 0x195,
+    VKD3D_SHADER_FILTER_MAXIMUM_ANISOTROPIC                        = 0x1d5,
+
+    VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER),
 };

enum vkd3d_texture_address_mode
@@ -403,7 +403,7 @@ enum vkd3d_static_border_color

struct vkd3d_static_sampler_desc
 {
-    enum vkd3d_filter filter;
+    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;