Commit 29c1e1fc authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM4 icb register.

parent 4d162e2e
...@@ -2406,6 +2406,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * ...@@ -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); sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset);
break; 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: case WINED3DSPR_PRIMID:
sprintf(register_name, "uint(gl_PrimitiveIDIn)"); sprintf(register_name, "uint(gl_PrimitiveIDIn)");
break; break;
......
...@@ -1459,6 +1459,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, ...@@ -1459,6 +1459,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg,
TRACE("cb"); TRACE("cb");
break; break;
case WINED3DSPR_IMMCONSTBUFFER:
TRACE("icb");
break;
case WINED3DSPR_PRIMID: case WINED3DSPR_PRIMID:
TRACE("primID"); TRACE("primID");
break; break;
......
...@@ -155,16 +155,17 @@ enum wined3d_sm4_opcode ...@@ -155,16 +155,17 @@ enum wined3d_sm4_opcode
enum wined3d_sm4_register_type enum wined3d_sm4_register_type
{ {
WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_TEMP = 0x0,
WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_INPUT = 0x1,
WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_OUTPUT = 0x2,
WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_IMMCONST = 0x4,
WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_SAMPLER = 0x6,
WINED3D_SM4_RT_RESOURCE = 0x7, WINED3D_SM4_RT_RESOURCE = 0x7,
WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_CONSTBUFFER = 0x8,
WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9,
WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_PRIMID = 0xb,
WINED3D_SM4_RT_NULL = 0xd, WINED3D_SM4_RT_DEPTHOUT = 0xc,
WINED3D_SM4_RT_NULL = 0xd,
}; };
enum wined3d_sm4_output_primitive_type enum wined3d_sm4_output_primitive_type
...@@ -350,7 +351,7 @@ static const enum wined3d_shader_register_type register_type_table[] = ...@@ -350,7 +351,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
/* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER,
/* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE,
/* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER,
/* UNKNOWN */ 0, /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER,
/* UNKNOWN */ 0, /* UNKNOWN */ 0,
/* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID,
/* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT,
......
...@@ -359,6 +359,7 @@ enum wined3d_shader_register_type ...@@ -359,6 +359,7 @@ enum wined3d_shader_register_type
WINED3DSPR_PREDICATE = 19, WINED3DSPR_PREDICATE = 19,
WINED3DSPR_IMMCONST, WINED3DSPR_IMMCONST,
WINED3DSPR_CONSTBUFFER, WINED3DSPR_CONSTBUFFER,
WINED3DSPR_IMMCONSTBUFFER,
WINED3DSPR_PRIMID, WINED3DSPR_PRIMID,
WINED3DSPR_NULL, WINED3DSPR_NULL,
WINED3DSPR_RESOURCE, WINED3DSPR_RESOURCE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment