Henri Verbeet : wined3d: Replace some shader_is_pshader_version() calls with plain type checks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3484d46a36f2381132dfc617a3f743f4ea927839
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3484d46a36f2381132dfc617a3...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Jul  7 11:08:04 2009 +0200

wined3d: Replace some shader_is_pshader_version() calls with plain type checks.

---

 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: