[PATCH 5/9] wined3d: Recognize SM5 vOutputControlPointID register.
Józef Kucia
jkucia at codeweavers.com
Mon Apr 4 04:26:32 CDT 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/shader.c | 4 ++++
dlls/wined3d/shader_sm4.c | 33 +++++++++++++++++----------------
dlls/wined3d/wined3d_private.h | 1 +
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 920abd7..776ff48 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1686,6 +1686,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer,
shader_addline(buffer, "u");
break;
+ case WINED3DSPR_OUTPOINTID:
+ shader_addline(buffer, "vOutputControlPointID");
+ break;
+
case WINED3DSPR_FORKINSTID:
shader_addline(buffer, "vForkInstanceId");
break;
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index a949312..71ff1dc 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -211,21 +211,22 @@ enum wined3d_sm4_opcode
enum wined3d_sm4_register_type
{
- WINED3D_SM4_RT_TEMP = 0x0,
- WINED3D_SM4_RT_INPUT = 0x1,
- WINED3D_SM4_RT_OUTPUT = 0x2,
- WINED3D_SM4_RT_IMMCONST = 0x4,
- WINED3D_SM4_RT_SAMPLER = 0x6,
- WINED3D_SM4_RT_RESOURCE = 0x7,
- WINED3D_SM4_RT_CONSTBUFFER = 0x8,
- WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9,
- WINED3D_SM4_RT_PRIMID = 0xb,
- WINED3D_SM4_RT_DEPTHOUT = 0xc,
- WINED3D_SM4_RT_NULL = 0xd,
- WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17,
- WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19,
- WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c,
- WINED3D_SM5_RT_UAV = 0x1e,
+ WINED3D_SM4_RT_TEMP = 0x0,
+ WINED3D_SM4_RT_INPUT = 0x1,
+ WINED3D_SM4_RT_OUTPUT = 0x2,
+ WINED3D_SM4_RT_IMMCONST = 0x4,
+ WINED3D_SM4_RT_SAMPLER = 0x6,
+ WINED3D_SM4_RT_RESOURCE = 0x7,
+ WINED3D_SM4_RT_CONSTBUFFER = 0x8,
+ WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9,
+ WINED3D_SM4_RT_PRIMID = 0xb,
+ WINED3D_SM4_RT_DEPTHOUT = 0xc,
+ WINED3D_SM4_RT_NULL = 0xd,
+ 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_DOMAIN_LOCATION = 0x1c,
+ WINED3D_SM5_RT_UAV = 0x1e,
};
enum wined3d_sm4_output_primitive_type
@@ -752,7 +753,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
/* UNKNOWN */ ~0u,
/* UNKNOWN */ ~0u,
/* UNKNOWN */ ~0u,
- /* UNKNOWN */ ~0u,
+ /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID */ WINED3DSPR_OUTPOINTID,
/* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID,
/* UNKNOWN */ ~0u,
/* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b1a4ce4..72da44a7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -368,6 +368,7 @@ enum wined3d_shader_register_type
WINED3DSPR_NULL,
WINED3DSPR_RESOURCE,
WINED3DSPR_UAV,
+ WINED3DSPR_OUTPOINTID,
WINED3DSPR_FORKINSTID,
WINED3DSPR_INCONTROLPOINT,
WINED3DSPR_TESSCOORD,
--
2.4.10
More information about the wine-patches
mailing list