Module: wine Branch: master Commit: 916167e93aea5c3cfcd8e7fdea07119721b76961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916167e93aea5c3cfcd8e7fdea... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 13:40:03 2010 +0200 wined3d: Recognize the SM4 resource register type. --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f6546c8..1febf56 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1027,6 +1027,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("null"); break; + case WINED3DSPR_RESOURCE: + TRACE("t"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d7bd76f..2bcd3d3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -166,7 +166,7 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* UNKNOWN */ 0, /* UNKNOWN */ 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b291d43..7959c8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -309,6 +309,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, WINED3DSPR_NULL, + WINED3DSPR_RESOURCE, } WINED3DSHADER_PARAM_REGISTER_TYPE; enum wined3d_immconst_type