mesa: make writemask_string() non-static

(cherry picked from commit 610c2461ce0683ca5412e4b2b7a496f67e9d3704)

Conflicts:

	src/mesa/shader/prog_print.c

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 4b92992f6dd7fa6514a5623814aaefbe30ad2a0d..8a50fe76fe671b7f0b81c11b9e88299132b49d3f 100644 (file)
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -358,6 +358,7 @@ _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
 }
 
 
+<<<<<<< HEAD:src/mesa/shader/prog_print.c
 void
 _mesa_print_swizzle(GLuint swizzle)
 {
@@ -371,8 +372,8 @@ _mesa_print_swizzle(GLuint swizzle)
 }
 
 
-static const char *
-writemask_string(GLuint writeMask)
+const char *
+_mesa_writemask_string(GLuint writeMask)
 {
    static char s[10];
    GLuint i = 0;
@@ -420,7 +421,7 @@ print_dst_reg(const struct prog_dst_register *dstReg, gl_prog_print_mode mode,
    _mesa_printf("%s%s",
                 reg_string((enum register_file) dstReg->File,
                            dstReg->Index, mode, dstReg->RelAddr, prog),
-                writemask_string(dstReg->WriteMask));
+                _mesa_writemask_string(dstReg->WriteMask));
 
    if (dstReg->CondMask != COND_TR) {
       _mesa_printf(" (%s.%s)",
@@ -432,7 +433,7 @@ print_dst_reg(const struct prog_dst_register *dstReg, gl_prog_print_mode mode,
    _mesa_printf("%s[%d]%s",
                 file_string((enum register_file) dstReg->File, mode),
                 dstReg->Index,
-                writemask_string(dstReg->WriteMask));
+                _mesa_writemask_string(dstReg->WriteMask));
 #endif
 }
 

diff --git a/src/mesa/shader/prog_print.h b/src/mesa/shader/prog_print.h
index 3cdb1b195e05dd7c587f8fa0c34f2c82e64528f6..3966909aed02c623b2b023c13a575b5568c02a62 100644 (file)
--- a/src/mesa/shader/prog_print.h
+++ b/src/mesa/shader/prog_print.h
@@ -43,6 +43,9 @@ _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);