[PATCH 5/5] wined3d: Replace some shader_is_pshader_version() calls with plain type checks.
Henri Verbeet
hverbeet at codeweavers.com
Tue Jul 7 04:08:04 CDT 2009
---
dlls/wined3d/baseshader.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index ae28565..4e3fb92 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -762,7 +762,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti
else
{
/* Pixel shaders 3.0 don't have usage semantics */
- if (shader_is_pshader_version(shader_version->type) && shader_version->major < 3)
+ if (shader_version->major < 3 && shader_version->type == WINED3D_SHADER_TYPE_PIXEL)
return;
else
TRACE("_");
@@ -844,7 +844,7 @@ static void shader_dump_register(const struct wined3d_shader_register *reg,
break;
case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */
- TRACE("%c", shader_is_pshader_version(shader_version->type) ? 't' : 'a');
+ TRACE("%c", shader_version->type == WINED3D_SHADER_TYPE_PIXEL ? 't' : 'a');
break;
case WINED3DSPR_RASTOUT:
--
1.6.0.6
More information about the wine-patches
mailing list