Module: wine Branch: master Commit: 50c090dc15e658c445f33e373cc074c60bf26e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c090dc15e658c445f33e373c... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:59 2016 +0200 wined3d: Recognize SM4 indexable temporary registers. 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 1085fda..e9a4a84 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1771,6 +1771,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vThreadIDInGroupFlattened"); break; + case WINED3DSPR_IDXTEMP: + shader_addline(buffer, "x"); + 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 8961dc5..b17140d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -239,6 +239,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_INDEXABLE_TEMP = 0x3, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_RESOURCE = 0x7, @@ -828,7 +829,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_INDEXABLE_TEMP */ WINED3DSPR_IDXTEMP, /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce094ca..f89573c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -392,6 +392,7 @@ enum wined3d_shader_register_type WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX, + WINED3DSPR_IDXTEMP, }; enum wined3d_data_type