Module: wine Branch: master Commit: efb0d67a70696377fa3902356794ebaebfb5b04c URL: https://gitlab.winehq.org/wine/wine/-/commit/efb0d67a70696377fa3902356794eba...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Mar 20 19:38:11 2023 -0500
wined3d: Rename the "MaxTextureBlendStages" field of struct fragment_caps to "max_blend_stages".
---
dlls/wined3d/adapter_gl.c | 2 +- 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, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f9fb68e437b..576430c9284 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5190,7 +5190,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ 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.max_textures; - d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + d3d_info->limits.ffp_blend_stages = fragment_caps.max_blend_stages; 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; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 919a56ceca8..211071fae83 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2320,7 +2320,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ 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.max_textures; - d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + d3d_info->limits.ffp_blend_stages = fragment_caps.max_blend_stages; 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 3b3e9dfb2c3..b568a9e68ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5795,7 +5795,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen
/* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */
- caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; + caps->max_blend_stages = WINED3D_MAX_FFP_TEXTURES; caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); }
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 96bb4a5a6cc..8606d86516d 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1312,7 +1312,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen * The proper fix for this is not to use GL_ATI_fragment_shader on cards newer than the * r200 series and use an ARB or GLSL shader instead */ - caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; + caps->max_blend_stages = WINED3D_MAX_FFP_TEXTURES; caps->max_textures = 6; }
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 91342de6aa5..ba86e9dc2d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2529,7 +2529,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value;
caps->TextureOpCaps = fragment_caps.TextureOpCaps; - caps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages; + caps->MaxTextureBlendStages = fragment_caps.max_blend_stages; caps->MaxSimultaneousTextures = fragment_caps.max_textures;
caps->MaxUserClipPlanes = vertex_caps.max_user_clip_planes; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2662013f2a0..0fa509a2a6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12080,7 +12080,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s | WINED3DTEXOPCAPS_LERP | WINED3DTEXOPCAPS_BUMPENVMAP | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE; - caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; + caps->max_blend_stages = WINED3D_MAX_FFP_TEXTURES; caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); }
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 367041dd412..e49ae68a784 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -747,7 +747,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct WINED3DTEXOPCAPS_PREMODULATE */ #endif
- caps->MaxTextureBlendStages = min(WINED3D_MAX_FFP_TEXTURES, gl_info->limits.general_combiners); + caps->max_blend_stages = min(WINED3D_MAX_FFP_TEXTURES, gl_info->limits.general_combiners); caps->max_textures = gl_info->limits.ffp_textures; }
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fbaa6999326..a492876a093 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5185,7 +5185,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct if (gl_info->supported[ARB_TEXTURE_ENV_DOT3]) caps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3;
- caps->MaxTextureBlendStages = gl_info->limits.ffp_textures; + caps->max_blend_stages = gl_info->limits.ffp_textures; caps->max_textures = gl_info->limits.ffp_textures; }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 317fc4e5535..5f28b4f6f88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1997,7 +1997,7 @@ struct fragment_caps DWORD wined3d_caps; DWORD PrimitiveMiscCaps; DWORD TextureOpCaps; - DWORD MaxTextureBlendStages; + unsigned int max_blend_stages; unsigned int max_textures; };