Module: wine Branch: master Commit: 8dcdc8205fa261314a8d9e65d2870a3d97f1c4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcdc8205fa261314a8d9e65d2... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:59 2016 +0200 wined3d: Recognize vThreadIDInGroupFlattened 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 | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f7ecda3..a4177bc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1751,6 +1751,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_LOCALTHREADINDEX: + shader_addline(buffer, "vThreadIDInGroupFlattened"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 893c331..ada369b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,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_LOCAL_THREAD_INDEX = 0x24, }; enum wined3d_sm4_output_primitive_type @@ -818,6 +819,11 @@ 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, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d573cfc..e7c626d 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_LOCALTHREADINDEX, }; enum wined3d_data_type