Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/shader/prog_print.c

diff --cc progs/xdemos/Makefile
Simple merge

diff --cc src/mesa/shader/prog_print.c
index 22b8f1d,baa4ef8..db6eac4
--- 1/src/mesa/shader/prog_print.c
--- 2/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@@ -358,21 -356,8 +358,21 @@@ _mesa_swizzle_string(GLuint swizzle, GL
  }
  
  
- static const char *
- writemask_string(GLuint writeMask)
 +void
 +_mesa_print_swizzle(GLuint swizzle)
 +{
 +   if (swizzle == SWIZZLE_XYZW) {
 +      _mesa_printf(".xyzw\n");
 +   }
 +   else {
 +      const char *s = _mesa_swizzle_string(swizzle, 0, 0);
 +      _mesa_printf("%s\n", s);
 +   }
 +}
 +
 +
+ const char *
+ _mesa_writemask_string(GLuint writeMask)
  {
     static char s[10];
     GLuint i = 0;

diff --cc src/mesa/shader/prog_print.h
index 3cdb1b1,cd9e388..3966909
--- 1/src/mesa/shader/prog_print.h
--- 2/src/mesa/shader/prog_print.h
+++ b/src/mesa/shader/prog_print.h
@@@ -43,10 -43,10 +43,13 @@@ _mesa_condcode_string(GLuint condcode)
  extern const char *
  _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended);
  
+ const char *
+ _mesa_writemask_string(GLuint writeMask);
+ 
  extern void
 +_mesa_print_swizzle(GLuint swizzle);
 +
 +extern void
  _mesa_print_alu_instruction(const struct prog_instruction *inst,
                              const char *opcode_string, GLuint numRegs);