Module: wine Branch: master Commit: 86f9eab8e2a5d151517685cb1e5d80077961054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f9eab8e2a5d151517685cb1e... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:51 2017 +0200 wined3d: Recognize SM5 vGSInstanceID 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 7dc276f..a29c1f3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2122,6 +2122,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "oMask"); break; + case WINED3DSPR_GSINSTID: + shader_addline(buffer, "vGSInstanceID"); + 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 614b545..c670996 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -328,6 +328,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_COVERAGE = 0x23, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, + WINED3D_SM5_RT_GS_INSTANCE_ID = 0x25, }; enum wined3d_sm4_output_primitive_type @@ -1093,6 +1094,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* WINED3D_SM5_RT_COVERAGE */ WINED3DSPR_COVERAGE, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, + /* WINED3D_SM5_RT_GS_INSTANCE_ID */ WINED3DSPR_GSINSTID, }; 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 b8ee413..eef7cc8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -490,6 +490,7 @@ enum wined3d_shader_register_type WINED3DSPR_FUNCTIONPOINTER, WINED3DSPR_COVERAGE, WINED3DSPR_SAMPLEMASK, + WINED3DSPR_GSINSTID, }; enum wined3d_data_type