Mesa (master): r300/compiler: fix warnings

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 185434fbe8e5e1ce650304bd077766b4e77b5f91
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=185434fbe8e5e1ce650304bd077766b4e77b5f91

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Sep 13 07:51:47 2010 +0200

r300/compiler: fix warnings

---

 .../dri/r300/compiler/radeon_pair_translate.c      |    4 ++--
 .../dri/r300/compiler/radeon_remove_constants.c    |    1 +
 2 files changed, 3 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 2ba25d2..ff82584 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_translate.c
@@ -225,7 +225,7 @@ 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);
 			if (source < 0) {
-				rc_error(c, "Failed to translate "
+				rc_error(&c->Base, "Failed to translate "
 							"rgb instruction.\n");
 				return;
 			}
@@ -245,7 +245,7 @@ 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);
 			if (source < 0) {
-				rc_error(c, "Failed to translate "
+				rc_error(&c->Base, "Failed to translate "
 							"alpha instruction.\n");
 				return;
 			}
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_remove_constants.c b/src/mesa/drivers/dri/r300/compiler/radeon_remove_constants.c
index facea38..d111319 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_remove_constants.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_remove_constants.c
@@ -26,6 +26,7 @@
  */
 
 #include "radeon_remove_constants.h"
+#include "radeon_dataflow.h"
 
 static void remap_regs(void * userdata, struct rc_instruction * inst,
 			rc_register_file * pfile, unsigned int * pindex)