Henri Verbeet : wined3d: Recognise the SM4 "primID" register type.
Alexandre Julliard
julliard at winehq.org
Tue Oct 16 15:27:46 CDT 2012
Module: wine
Branch: master
Commit: 59bdd6ae9715d143b84e669c59be7e5841bd36ad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bdd6ae9715d143b84e669c59be7e5841bd36ad
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Oct 15 22:26:19 2012 +0200
wined3d: Recognise the SM4 "primID" register type.
---
dlls/wined3d/shader.c | 4 ++++
dlls/wined3d/shader_sm4.c | 3 ++-
dlls/wined3d/wined3d_private.h | 2 ++
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 9c70f08..b735b77 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -992,6 +992,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg,
TRACE("cb");
break;
+ case WINED3DSPR_PRIMID:
+ TRACE("primID");
+ break;
+
case WINED3DSPR_NULL:
TRACE("null");
break;
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index b69ba82..1159d6e 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -131,6 +131,7 @@ enum wined3d_sm4_register_type
WINED3D_SM4_RT_IMMCONST = 0x4,
WINED3D_SM4_RT_SAMPLER = 0x6,
WINED3D_SM4_RT_CONSTBUFFER = 0x8,
+ WINED3D_SM4_RT_PRIMID = 0xb,
WINED3D_SM4_RT_NULL = 0xd,
};
@@ -269,7 +270,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
/* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER,
/* UNKNOWN */ 0,
/* UNKNOWN */ 0,
- /* UNKNOWN */ 0,
+ /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID,
/* UNKNOWN */ 0,
/* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL,
};
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 56bdbad..06f75de 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -320,6 +320,7 @@ enum wined3d_shader_register_type
WINED3DSPR_PREDICATE = 19,
WINED3DSPR_IMMCONST,
WINED3DSPR_CONSTBUFFER,
+ WINED3DSPR_PRIMID,
WINED3DSPR_NULL,
WINED3DSPR_RESOURCE,
};
@@ -2678,6 +2679,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg)
case WINED3DSPR_CONSTBOOL: /* b# */
case WINED3DSPR_LOOP: /* aL */
case WINED3DSPR_PREDICATE: /* p0 */
+ case WINED3DSPR_PRIMID: /* primID */
return TRUE;
case WINED3DSPR_MISCTYPE:
More information about the wine-cvs
mailing list