Commit efb0d67a authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Rename the "MaxTextureBlendStages" field of struct fragment_caps to "max_blend_stages".

parent 82873b72
......@@ -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;
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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;
}
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment