=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Do not use texture unit mapping for SM4+ shaders.

Alexandre Julliard julliard at winehq.org
Tue Mar 14 16:14:37 CDT 2017


Module: wine
Branch: master
Commit: ea6c61a5342c703b2194fa334f508d377980132e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea6c61a5342c703b2194fa334f508d377980132e

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Mar 14 13:15:56 2017 +0100

wined3d: Do not use texture unit mapping for SM4+ shaders.

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

---

 dlls/wined3d/glsl_shader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ecaa667..f7f6ca5 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -631,7 +631,7 @@ static void shader_glsl_load_samplers(const struct wined3d_context *context,
     unsigned int base, count;
 
     wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, version->type, &base, &count);
-    tex_unit_map = version->type == WINED3D_SHADER_TYPE_COMPUTE ? NULL : context->tex_unit_map;
+    tex_unit_map = version->major >= 4 ? NULL : context->tex_unit_map;
     shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map);
 }
 




More information about the wine-cvs mailing list