[PATCH 4/5] wined3d: Recognize SM4 icb register.
Józef Kucia
jkucia at codeweavers.com
Fri Jan 29 02:44:44 CST 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/glsl_shader.c | 7 +++++++
dlls/wined3d/shader.c | 4 ++++
dlls/wined3d/shader_sm4.c | 23 ++++++++++++-----------
dlls/wined3d/wined3d_private.h | 1 +
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 62476fe..dd8e68b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2406,6 +2406,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset);
break;
+ case WINED3DSPR_IMMCONSTBUFFER:
+ if (reg->idx[0].rel_addr)
+ sprintf(register_name, "%s_icb[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset);
+ else
+ sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset);
+ break;
+
case WINED3DSPR_PRIMID:
sprintf(register_name, "uint(gl_PrimitiveIDIn)");
break;
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 5eb3a3b..97d63a0 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1476,6 +1476,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg,
TRACE("cb");
break;
+ case WINED3DSPR_IMMCONSTBUFFER:
+ TRACE("icb");
+ break;
+
case WINED3DSPR_PRIMID:
TRACE("primID");
break;
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 1299998..876466c 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -159,16 +159,17 @@ 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_PRIMID = 0xb,
- WINED3D_SM4_RT_DEPTHOUT = 0xc,
- WINED3D_SM4_RT_NULL = 0xd,
+ 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,
};
enum wined3d_sm4_output_primitive_type
@@ -362,7 +363,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
/* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER,
/* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE,
/* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER,
- /* UNKNOWN */ 0,
+ /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER,
/* UNKNOWN */ 0,
/* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID,
/* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b8c453d..d88610d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -359,6 +359,7 @@ enum wined3d_shader_register_type
WINED3DSPR_PREDICATE = 19,
WINED3DSPR_IMMCONST,
WINED3DSPR_CONSTBUFFER,
+ WINED3DSPR_IMMCONSTBUFFER,
WINED3DSPR_PRIMID,
WINED3DSPR_NULL,
WINED3DSPR_RESOURCE,
--
2.4.10
More information about the wine-patches
mailing list