Module: wine Branch: master Commit: c2651c5617b92a2c224934ecc7c431f9f411a5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2651c5617b92a2c224934ecc7... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:30 2016 +0200 wined3d: Recognize thread group shared memory 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 | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 55de679..f88ccb5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1730,6 +1730,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vDomainLocation"); break; + case WINED3DSPR_GROUPSHAREDMEM: + shader_addline(buffer, "g"); + 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 45a3d04..4603d9a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -242,6 +242,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, + WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, }; enum wined3d_sm4_output_primitive_type @@ -800,6 +801,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, + /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, }; 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 ffcfb81..7ad7bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -386,6 +386,7 @@ enum wined3d_shader_register_type WINED3DSPR_INCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, + WINED3DSPR_GROUPSHAREDMEM, }; enum wined3d_data_type