Module: wine Branch: master Commit: a2ca4244bbc4d94ef91b11271453355479b8d0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ca4244bbc4d94ef91b112714...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Oct 3 00:38:36 2016 +0200
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
---
dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f809e4a..f8ecb80 100644 --- 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->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); + caps->MaxTextureBlendStages = MAX_TEXTURES; + caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES); }
static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index cd32009..7a04f76 100644 --- 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; }
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b0f3224..55cbdcf 100644 --- 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->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); + caps->MaxTextureBlendStages = MAX_TEXTURES; + 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)