Zebediah Figura : wined3d: Rename the "MaxSimultaneousTextures" field of struct fragment_caps to "max_textures".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 82873b72a254ce89349804ede36b07af566d8dda
URL:    https://gitlab.winehq.org/wine/wine/-/commit/82873b72a254ce89349804ede36b07a...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Mon Mar 20 19:32:57 2023 -0500

wined3d: Rename the "MaxSimultaneousTextures" field of struct fragment_caps to "max_textures".

---

 dlls/wined3d/adapter_gl.c            | 4 ++--
 dlls/wined3d/adapter_vk.c            | 2 +-
 dlls/wined3d/arb_program_shader.c    | 2 +-
 dlls/wined3d/ati_fragment_shader.c   | 2 +-
 dlls/wined3d/directx.c               | 2 +-
 dlls/wined3d/glsl_shader.c           | 2 +-
 dlls/wined3d/nvidia_texture_shader.c | 2 +-
 dlls/wined3d/state.c                 | 2 +-
 dlls/wined3d/wined3d_private.h       | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index a9454e51b53..f9fb68e437b 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -1298,7 +1298,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g
 
     if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3)
         return WINED3D_FEATURE_LEVEL_7;
-    if (fragment_caps->MaxSimultaneousTextures > 1)
+    if (fragment_caps->max_textures > 1)
         return WINED3D_FEATURE_LEVEL_6;
 
     return WINED3D_FEATURE_LEVEL_5;
@@ -5189,7 +5189,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_
     d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count;
     d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count;
     d3d_info->limits.varying_count = shader_caps.varying_count;
-    d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures;
+    d3d_info->limits.ffp_textures = fragment_caps.max_textures;
     d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages;
     TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages);
     d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices;
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index fffe33a76d4..919a56ceca8 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2319,7 +2319,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_
     d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count;
     d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count;
     d3d_info->limits.varying_count = shader_caps.varying_count;
-    d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures;
+    d3d_info->limits.ffp_textures = fragment_caps.max_textures;
     d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages;
     d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices;
     d3d_info->limits.active_light_count = vertex_caps.max_active_lights;
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index f0e1b2bdf99..3b3e9dfb2c3 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5796,7 +5796,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen
     /* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */
 
     caps->MaxTextureBlendStages   = WINED3D_MAX_FFP_TEXTURES;
-    caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES);
+    caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES);
 }
 
 static unsigned int arbfp_get_emul_mask(const struct wined3d_adapter *adapter)
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index 2a457a93ff6..96bb4a5a6cc 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -1313,7 +1313,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen
      * r200 series and use an ARB or GLSL shader instead
      */
     caps->MaxTextureBlendStages   = WINED3D_MAX_FFP_TEXTURES;
-    caps->MaxSimultaneousTextures = 6;
+    caps->max_textures = 6;
 }
 
 static unsigned int atifs_get_emul_mask(const struct wined3d_adapter *adapter)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 78e743900ec..91342de6aa5 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2530,7 +2530,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter,
 
     caps->TextureOpCaps                    = fragment_caps.TextureOpCaps;
     caps->MaxTextureBlendStages            = fragment_caps.MaxTextureBlendStages;
-    caps->MaxSimultaneousTextures          = fragment_caps.MaxSimultaneousTextures;
+    caps->MaxSimultaneousTextures          = fragment_caps.max_textures;
 
     caps->MaxUserClipPlanes                = vertex_caps.max_user_clip_planes;
     caps->MaxActiveLights                  = vertex_caps.max_active_lights;
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index b4960fc16a4..2662013f2a0 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -12081,7 +12081,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s
             | WINED3DTEXOPCAPS_BUMPENVMAP
             | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE;
     caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES;
-    caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES);
+    caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES);
 }
 
 static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_adapter *adapter)
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index 5fd66f73827..367041dd412 100644
--- a/dlls/wined3d/nvidia_texture_shader.c
+++ b/dlls/wined3d/nvidia_texture_shader.c
@@ -748,7 +748,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct
 #endif
 
     caps->MaxTextureBlendStages = min(WINED3D_MAX_FFP_TEXTURES, gl_info->limits.general_combiners);
-    caps->MaxSimultaneousTextures = gl_info->limits.ffp_textures;
+    caps->max_textures = gl_info->limits.ffp_textures;
 }
 
 static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_adapter *adapter)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index f7fb3493ea1..fbaa6999326 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -5186,7 +5186,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct
         caps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3;
 
     caps->MaxTextureBlendStages = gl_info->limits.ffp_textures;
-    caps->MaxSimultaneousTextures = gl_info->limits.ffp_textures;
+    caps->max_textures = gl_info->limits.ffp_textures;
 }
 
 static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_adapter *adapter)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6f1839de440..317fc4e5535 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1998,7 +1998,7 @@ struct fragment_caps
     DWORD PrimitiveMiscCaps;
     DWORD TextureOpCaps;
     DWORD MaxTextureBlendStages;
-    DWORD MaxSimultaneousTextures;
+    unsigned int max_textures;
 };
 
 #define GL_EXT_EMUL_ARB_MULTITEXTURE 0x00000001