From d442c7f172df72875bc4a4c8e20ddd8c49dee12a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 6 Sep 2010 20:48:10 -0700 Subject: r300/compiler: Replace asserts with error messages --- src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c | 12 ++++++++++-- 1 file 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 4cdb7ea748e..2ba25d26014 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; -- cgit v1.2.3