use WRITEMASK_* tokens

diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index e1eeebd9a3fca45a5fab6ab10ebf8866d579f5d4..2e1113267a6e0830a741053f27947c7943038ac6 100644 (file)
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1705,15 +1705,15 @@ PrintDstReg(const struct fp_dst_register *dst)
       _mesa_printf("???");
    }
 
-   if (dst->WriteMask != 0 && dst->WriteMask != 0xf) {
+   if (dst->WriteMask != 0 && dst->WriteMask != WRITEMASK_XYZW) {
       _mesa_printf(".");
-      if (dst->WriteMask & 0x1)
+      if (dst->WriteMask & WRITEMASK_X)
          _mesa_printf("x");
-      if (dst->WriteMask & 0x2)
+      if (dst->WriteMask & WRITEMASK_Y)
          _mesa_printf("y");
-      if (dst->WriteMask & 0x4)
+      if (dst->WriteMask & WRITEMASK_Z)
          _mesa_printf("z");
-      if (dst->WriteMask & 0x8)
+      if (dst->WriteMask & WRITEMASK_W)
          _mesa_printf("w");
    }
 
@@ -1834,7 +1834,7 @@ _mesa_init_fp_instruction(struct fp_instruction *inst)
    inst->SrcReg[2].File = PROGRAM_UNDEFINED;
    inst->SrcReg[2].Swizzle = SWIZZLE_NOOP;
    inst->DstReg.File = PROGRAM_UNDEFINED;
-   inst->DstReg.WriteMask = 0xf;
+   inst->DstReg.WriteMask = WRITEMASK_XYZW;
    inst->DstReg.CondSwizzle = SWIZZLE_NOOP;
    inst->Precision = FLOAT32;
    inst->DstReg.CondMask = COND_TR;

diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 24882a289797c8606818ee8e815eb6ed88007450..c36d43dd24e8bf7d7ffcf29b145dc8212fdd6f83 100644 (file)
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -1478,15 +1478,15 @@ PrintDstReg(const struct vp_dst_register *dst)
       _mesa_printf("R%d", dst->Index);
    }
 
-   if (dst->WriteMask != 0 && dst->WriteMask != 0xf) {
+   if (dst->WriteMask != 0 && dst->WriteMask != WRITEMASK_XYZW) {
       _mesa_printf(".");
-      if (dst->WriteMask & 0x1)
+      if (dst->WriteMask & WRITEMASK_X)
          _mesa_printf("x");
-      if (dst->WriteMask & 0x2)
+      if (dst->WriteMask & WRITEMASK_Y)
          _mesa_printf("y");
-      if (dst->WriteMask & 0x4)
+      if (dst->WriteMask & WRITEMASK_Z)
          _mesa_printf("z");
-      if (dst->WriteMask & 0x8)
+      if (dst->WriteMask & WRITEMASK_W)
          _mesa_printf("w");
    }
 }
@@ -1614,6 +1614,6 @@ _mesa_init_vp_instruction(struct vp_instruction *inst)
    inst->SrcReg[2].File = PROGRAM_UNDEFINED;
    inst->SrcReg[2].Swizzle = SWIZZLE_NOOP;
    inst->DstReg.File = PROGRAM_UNDEFINED;
-   inst->DstReg.WriteMask = 0xf;
+   inst->DstReg.WriteMask = WRITEMASK_XYZW;
 }