Mesa (master): r300/compiler: Replace asserts with error messages
Tom Stellard
tstellar at kemper.freedesktop.org
Sat Sep 11 02:54:09 UTC 2010
Module: Mesa
Branch: master
Commit: d442c7f172df72875bc4a4c8e20ddd8c49dee12a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d442c7f172df72875bc4a4c8e20ddd8c49dee12a
Author: Tom Stellard <tstellar at gmail.com>
Date: Mon Sep 6 20:48:10 2010 -0700
r300/compiler: Replace asserts with error messages
---
.../dri/r300/compiler/radeon_pair_translate.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c
index 4cdb7ea..2ba25d2 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c
@@ -224,7 +224,11 @@ static void set_pair_instruction(struct r300_fragment_program_compiler *c,
}
source = rc_pair_alloc_source(pair, srcrgb, srcalpha,
inst->SrcReg[i].File, inst->SrcReg[i].Index);
- assert(source != -1);
+ if (source < 0) {
+ rc_error(c, "Failed to translate "
+ "rgb instruction.\n");
+ return;
+ }
pair->RGB.Arg[i].Source = source;
pair->RGB.Arg[i].Swizzle = inst->SrcReg[i].Swizzle & 0x1ff;
pair->RGB.Arg[i].Abs = inst->SrcReg[i].Abs;
@@ -240,7 +244,11 @@ static void set_pair_instruction(struct r300_fragment_program_compiler *c,
srcalpha = 1;
source = rc_pair_alloc_source(pair, srcrgb, srcalpha,
inst->SrcReg[i].File, inst->SrcReg[i].Index);
- assert(source != -1);
+ if (source < 0) {
+ rc_error(c, "Failed to translate "
+ "alpha instruction.\n");
+ return;
+ }
pair->Alpha.Arg[i].Source = source;
pair->Alpha.Arg[i].Swizzle = swz;
pair->Alpha.Arg[i].Abs = inst->SrcReg[i].Abs;
More information about the mesa-commit
mailing list