Module: wine Branch: master Commit: 12754d0f255b3514a0b9f5b67b628fa936edd536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12754d0f255b3514a0b9f5b67b... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:29 2016 +0200 wined3d: Recognize vThreadID register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 7682850..b79416f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1752,6 +1752,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_THREADID: + shader_addline(buffer, "vThreadID"); + break; + case WINED3DSPR_THREADGROUPID: shader_addline(buffer, "vThreadGroupID"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6e224f6..447861c 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_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_THREAD_ID = 0x20, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, @@ -833,7 +834,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_THREAD_ID */ WINED3DSPR_THREADID, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 78cbe24..40eb8e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_THREADID, WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX,