projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
shader
/
prog_print.c
diff --git
a/src/mesa/shader/prog_print.c
b/src/mesa/shader/prog_print.c
index baa4ef85e921cd5060ae4a9187d30979a8589d26..db6eac4fd9844468ac33d204f791f42d4902df7a 100644
(file)
--- a/
src/mesa/shader/prog_print.c
+++ b/
src/mesa/shader/prog_print.c
@@
-250,7
+250,9
@@
reg_string(enum register_file f, GLint index, gl_prog_print_mode mode,
{
struct gl_program_parameter *param
= prog->Parameters->Parameters + index;
{
struct gl_program_parameter *param
= prog->Parameters->Parameters + index;
- sprintf(str, _mesa_program_state_string(param->StateIndexes));
+ char *state = _mesa_program_state_string(param->StateIndexes);
+ sprintf(str, state);
+ _mesa_free(state);
}
break;
case PROGRAM_ADDRESS:
}
break;
case PROGRAM_ADDRESS:
@@
-356,6
+358,19
@@
_mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
}
}
+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)
{
const char *
_mesa_writemask_string(GLuint writeMask)
{