Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_is_scalar().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 96005c0fcaeecf97c55c2b1fa0504aa011681d2f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=96005c0fcaeecf97c55c2b1fa0...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu May  7 16:36:08 2009 +0200

wined3d: Pass a struct wined3d_shader_register to shader_is_scalar().

---

 dlls/wined3d/glsl_shader.c     |    6 +++---
 dlls/wined3d/wined3d_private.h |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 3be9422..92be8dc 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1242,7 +1242,7 @@ static DWORD shader_glsl_get_write_mask(const struct wined3d_shader_dst_param *p
 {
     DWORD mask = param->write_mask;
 
-    if (shader_is_scalar(param->reg.type, param->reg.idx))
+    if (shader_is_scalar(¶m->reg))
     {
         mask = WINED3DSP_WRITEMASK_0;
         *write_mask = '\0';
@@ -1285,7 +1285,7 @@ static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD ma
 static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param,
         BOOL fixup, DWORD mask, char *swizzle_str)
 {
-    if (shader_is_scalar(param->reg.type, param->reg.idx))
+    if (shader_is_scalar(¶m->reg))
         *swizzle_str = '\0';
     else
         shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str);
@@ -1970,7 +1970,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins)
     char mask_char[6];
     BOOL temp_destination = FALSE;
 
-    if (shader_is_scalar(ins->src[0].reg.type, ins->src[0].reg.idx))
+    if (shader_is_scalar(&ins->src[0].reg))
     {
         write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins);
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8bda76a..2b63364 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2594,13 +2594,13 @@ static inline BOOL shader_is_vshader_version(enum wined3d_shader_type type)
     return type == WINED3D_SHADER_TYPE_VERTEX;
 }
 
-static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx)
+static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg)
 {
-    switch (register_type)
+    switch (reg->type)
     {
         case WINED3DSPR_RASTOUT:
             /* oFog & oPts */
-            if (register_idx != 0) return TRUE;
+            if (reg->idx != 0) return TRUE;
             /* oPos */
             return FALSE;
 
@@ -2611,7 +2611,7 @@ static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_t
             return TRUE;
 
         case WINED3DSPR_MISCTYPE:
-            switch(register_idx)
+            switch(reg->idx)
             {
                 case 0: /* vPos */
                     return FALSE;