Ivan Gyurdiev : wined3d: Parameter trace corrections.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 18 03:56:50 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: fa62d9d3b4866e52cbe00db36d55ed656be4852b
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa62d9d3b4866e52cbe00db36d55ed656be4852b
Author: Ivan Gyurdiev <ivg2 at cornell.edu>
Date: Wed May 17 21:08:29 2006 -0400
wined3d: Parameter trace corrections.
---
dlls/wined3d/baseshader.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 1af6a71..a9e847a 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -387,8 +387,17 @@ void shader_dump_param(
case D3DSPR_ATTROUT:
TRACE("oD%lu", reg);
break;
- case D3DSPR_TEXCRDOUT:
- TRACE("oT%lu", reg);
+ case D3DSPR_TEXCRDOUT:
+
+ /* Vertex shaders >= 3.0 use general purpose output registers
+ * (D3DSPR_OUTPUT), which can include an address token */
+
+ if (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) {
+ TRACE("o");
+ shader_dump_arr_entry(iface, param, addr_token, input);
+ }
+ else
+ TRACE("oT%lu", reg);
break;
case D3DSPR_CONSTINT:
TRACE("i");
@@ -403,13 +412,15 @@ void shader_dump_param(
break;
case D3DSPR_LOOP:
TRACE("aL");
- shader_dump_arr_entry(iface, param, addr_token, input);
break;
case D3DSPR_SAMPLER:
TRACE("s%lu", reg);
break;
+ case D3DSPR_PREDICATE:
+ TRACE("p%lu", reg);
+ break;
default:
- TRACE("unhandled_rtype(%lx)", regtype);
+ TRACE("unhandled_rtype(%#lx)", regtype);
break;
}
More information about the wine-cvs
mailing list