summaryrefslogtreecommitdiff
path: root/src/mesa/shader/prog_print.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-01-06 08:47:05 -0700
committerBrian Paul <brianp@vmware.com>2009-01-06 08:47:05 -0700
commite8fa7e500c52db6764d4102360f2202005bcf817 (patch)
tree77de8f616a8226ebdbde8278e1fa3fea40dc788a /src/mesa/shader/prog_print.c
parent2bdf076554f19f4f42cbfc6e14b6abd94bea3351 (diff)
mesa: make writemask_string() non-static
(cherry picked from commit 610c2461ce0683ca5412e4b2b7a496f67e9d3704) Conflicts: src/mesa/shader/prog_print.c
Diffstat (limited to 'src/mesa/shader/prog_print.c')
-rw-r--r--src/mesa/shader/prog_print.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 4b92992f6d..8a50fe76fe 100644
--- 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
}