Module: wine Branch: master Commit: d6ffe00cd271257e9c81cbf57fb5b3d4e3416cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ffe00cd271257e9c81cbf57f...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jul 16 13:08:22 2009 +0200
wined3d: Recognize the SM4 constant buffer register type.
---
dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 23 ++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4b9c445..e1e1f21 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -928,6 +928,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("l"); break;
+ case WINED3DSPR_CONSTBUFFER: + TRACE("cb"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 57a365b..f5c3e65 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -58,10 +58,11 @@ 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_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, };
enum wined3d_sm4_immconst_type @@ -104,11 +105,15 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ 0, - /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, };
static const struct sysval_map sysval_map[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9aa93..ae09827 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -325,6 +325,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_LABEL = 18, WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, + WINED3DSPR_CONSTBUFFER, } WINED3DSHADER_PARAM_REGISTER_TYPE;
enum wined3d_immconst_type