Module: wine Branch: master Commit: dee9d1403a4df348639454ed6ed57696af47f586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee9d1403a4df348639454ed6e... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:18 2016 +0200 wined3d: Recognize SM5 vocp 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 d671ad0..6d4155b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1779,6 +1779,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vicp"); break; + case WINED3DSPR_OUTCONTROLPOINT: + shader_addline(buffer, "vocp"); + break; + case WINED3DSPR_PATCHCONST: shader_addline(buffer, "vpc"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c8fdb32..24af95d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -259,6 +259,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + WINED3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, @@ -877,7 +878,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT */ WINED3DSPR_OUTCONTROLPOINT, /* WINED3D_SM5_RT_PATCH_CONSTANT_DATA */ WINED3DSPR_PATCHCONST, /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41c127b..b5c10a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -385,6 +385,7 @@ enum wined3d_shader_register_type WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, WINED3DSPR_INCONTROLPOINT, + WINED3DSPR_OUTCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM,