r300/compiler: fix warnings

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 2ba25d2601454199e137ce43bf64166bc3a3525a..ff825844663177047a886b69265b78d81142d282 100644 (file)
--- 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 facea382f4ee14eae5a928fcb0d856814a1ad4d2..d111319d3d980bad0fcc4d091db9e2e5a5d43489 100644 (file)
--- 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)