=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Allow swizzle on vThreadIDInGroupFlattened register.

Alexandre Julliard julliard at winehq.org
Mon Feb 27 15:12:08 CST 2017


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Sun Feb 26 18:48:00 2017 +0100

wined3d: Allow swizzle on vThreadIDInGroupFlattened register.

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 +-
 dlls/wined3d/wined3d_private.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 28d1c15..26a6a06 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2860,7 +2860,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
             break;
 
         case WINED3DSPR_LOCALTHREADINDEX:
-            sprintf(register_name, "int(gl_LocalInvocationIndex)");
+            sprintf(register_name, "ivec2(gl_LocalInvocationIndex, 0)");
             break;
 
         case WINED3DSPR_THREADID:
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4ccef50..ec0fcbf 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3672,7 +3672,6 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg)
         case WINED3DSPR_LOOP:       /* aL */
         case WINED3DSPR_PREDICATE:  /* p0 */
         case WINED3DSPR_PRIMID:     /* primID */
-        case WINED3DSPR_LOCALTHREADINDEX: /* vThreadIDInGroupFlattened */
             return TRUE;
 
         case WINED3DSPR_MISCTYPE:




More information about the wine-cvs mailing list