Mesa (9.2): gallium/postprocessing: fix shader parsing
Ian Romanick
idr at kemper.freedesktop.org
Tue Aug 6 16:22:50 UTC 2013
Module: Mesa
Branch: 9.2
Commit: ded1695494990e8e2764c0aaa0b809fa52091889
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ded1695494990e8e2764c0aaa0b809fa52091889
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Jul 30 22:29:12 2013 +0200
gallium/postprocessing: fix shader parsing
tokens was converted to a pointer, which made the Elements macro return 1.
Broken by e87fc11cac696881469a57955af2ac7b4929a2c7.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit c84e8d039ec9c7532b25757012aa3828f4f8a70d)
---
src/gallium/auxiliary/postprocess/pp_run.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/postprocess/pp_run.c b/src/gallium/auxiliary/postprocess/pp_run.c
index 0d95c72..7c0f85c 100644
--- a/src/gallium/auxiliary/postprocess/pp_run.c
+++ b/src/gallium/auxiliary/postprocess/pp_run.c
@@ -218,8 +218,8 @@ pp_tgsi_to_state(struct pipe_context *pipe, const char *text, bool isvs,
return NULL;
}
- if (tgsi_text_translate(text, tokens, Elements(tokens)) == FALSE) {
- pp_debug("Failed to translate %s\n", name);
+ if (tgsi_text_translate(text, tokens, PP_MAX_TOKENS) == FALSE) {
+ _debug_printf("pp: Failed to translate a shader for %s\n", name);
return NULL;
}
More information about the mesa-commit
mailing list