Mesa (7.9): r300/compiler: Fix segfault in error path
Tom Stellard
tstellar at kemper.freedesktop.org
Wed Sep 29 18:20:12 UTC 2010
Module: Mesa
Branch: 7.9
Commit: fcf5819945f0f242b03c3a3590c887a47a1a1269
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcf5819945f0f242b03c3a3590c887a47a1a1269
Author: Tom Stellard <tstellar at gmail.com>
Date: Tue Sep 28 09:21:05 2010 -0700
r300/compiler: Fix segfault in error path
https://bugs.freedesktop.org/show_bug.cgi?id=30415
(cherry picked from commit d40ff5510ce60c5bc9db238e2650fa79104d84e9)
---
.../drivers/dri/r300/compiler/r500_fragprog_emit.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
index 54cff91..efa3bb5 100644
--- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
+++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
@@ -250,7 +250,7 @@ static void emit_paired(struct r300_fragment_program_compiler *c, struct rc_pair
if (inst->RGB.OutputWriteMask || inst->Alpha.OutputWriteMask || inst->Alpha.DepthWriteMask) {
code->inst[ip].inst0 = R500_INST_TYPE_OUT;
if (inst->WriteALUResult) {
- error("%s: cannot write output and ALU result at the same time");
+ error("Cannot write output and ALU result at the same time");
return;
}
} else {
More information about the mesa-commit
mailing list