projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 73dab75)
r300/compiler: Fix segfault in error path
authorTom Stellard <tstellar@gmail.com>
Tue, 28 Sep 2010 16:21:05 +0000 (09:21 -0700)
committerTom Stellard <tstellar@gmail.com>
Wed, 29 Sep 2010 06:52:41 +0000 (23:52 -0700)
https://bugs.freedesktop.org/show_bug.cgi?id=30415

NOTE: This is a candidate for the 7.9 branch.

src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c patch | blob | history

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 bad168469649d84446eb4b4144a1d80462b11e3f..407d92531a5fbb96acecf43cc63811386965007a 100644 (file)
--- 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 {