wined3d: Use MAX_TEXTURES instead of magic number.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Use MAX_TEXTURES instead of magic number.
a2ca4244 · Józef Kucia · Alexandre Julliard · b44a5668 · a2ca4244 · a2ca4244
Commit a2ca4244 authored Oct 03, 2016 by Józef Kucia Committed by Alexandre Julliard Oct 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

arb_program_shader.c dlls/wined3d/arb_program_shader.c +2 -2

ati_fragment_shader.c dlls/wined3d/ati_fragment_shader.c +1 -1

glsl_shader.c dlls/wined3d/glsl_shader.c +2 -2

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5934,8 +5934,8 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen
    /* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */
-    caps->MaxTextureBlendStages   = 8;
+    caps->MaxTextureBlendStages   = MAX_TEXTURES;
-    caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8);
+    caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES);
 }
 static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info)

--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -1307,7 +1307,7 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, 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   = 8;
+    caps->MaxTextureBlendStages   = MAX_TEXTURES;
    caps->MaxSimultaneousTextures = 6;
 }

--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -9433,8 +9433,8 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, s
            | WINED3DTEXOPCAPS_LERP
            | WINED3DTEXOPCAPS_BUMPENVMAP
            | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE;
-    caps->MaxTextureBlendStages = 8;
+    caps->MaxTextureBlendStages = MAX_TEXTURES;
-    caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8);
+    caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES);
 }
 static DWORD glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info)