=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize vThreadIDInGroup register.

Alexandre Julliard julliard at winehq.org
Tue Jun 21 11:13:48 CDT 2016


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Jun 21 13:10:01 2016 +0200

wined3d: Recognize vThreadIDInGroup 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/shader.c          | 4 ++++
 dlls/wined3d/shader_sm4.c      | 3 ++-
 dlls/wined3d/wined3d_private.h | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index eb87c94..729a137 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1755,6 +1755,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer,
             shader_addline(buffer, "vThreadGroupID");
             break;
 
+        case WINED3DSPR_LOCALTHREADID:
+            shader_addline(buffer, "vThreadIDInGroup");
+            break;
+
         case WINED3DSPR_LOCALTHREADINDEX:
             shader_addline(buffer, "vThreadIDInGroupFlattened");
             break;
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 4e7557d..f56f976 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -252,6 +252,7 @@ enum wined3d_sm4_register_type
     WINED3D_SM5_RT_UAV                     = 0x1e,
     WINED3D_SM5_RT_SHARED_MEMORY           = 0x1f,
     WINED3D_SM5_RT_THREAD_GROUP_ID         = 0x21,
+    WINED3D_SM5_RT_LOCAL_THREAD_ID         = 0x22,
     WINED3D_SM5_RT_LOCAL_THREAD_INDEX      = 0x24,
 };
 
@@ -822,7 +823,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
     /* WINED3D_SM5_RT_SHARED_MEMORY */           WINED3DSPR_GROUPSHAREDMEM,
     /* UNKNOWN */                                ~0u,
     /* WINED3D_SM5_RT_THREAD_GROUP_ID */         WINED3DSPR_THREADGROUPID,
-    /* UNKNOWN */                                ~0u,
+    /* WINED3D_SM5_RT_LOCAL_THREAD_ID */         WINED3DSPR_LOCALTHREADID,
     /* UNKNOWN */                                ~0u,
     /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */      WINED3DSPR_LOCALTHREADINDEX,
 };
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e3c3d2d..b44b2fa 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -389,6 +389,7 @@ enum wined3d_shader_register_type
     WINED3DSPR_TESSCOORD,
     WINED3DSPR_GROUPSHAREDMEM,
     WINED3DSPR_THREADGROUPID,
+    WINED3DSPR_LOCALTHREADID,
     WINED3DSPR_LOCALTHREADINDEX,
 };
 




More information about the wine-cvs mailing list