From 5ba0ba72d90a51312a00a9aaecd080344912a58f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 12 Jul 2010 14:12:02 -0700 Subject: r300g: Remove unnecessary header. --- src/gallium/drivers/r300/r300_emit.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index e1cb2bf5012..59a3cea1c3a 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -32,7 +32,6 @@ #include "r300_emit.h" #include "r300_fs.h" #include "r300_screen.h" -#include "r300_texture.h" #include "r300_screen_buffer.h" #include "r300_vs.h" -- cgit v1.2.3 From c6b7aa96f9c1f2cf5d23512e808ee4023fc2674d Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 12 Jul 2010 14:21:57 -0700 Subject: r600: Fix include recursion. Fix r600_context.h -> r700_oglprog.h -> r600_context.h include recursion. --- src/mesa/drivers/dri/r600/r700_oglprog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/mesa/drivers/dri/r600/r700_oglprog.h b/src/mesa/drivers/dri/r600/r700_oglprog.h index fe2e9d19749..4d421338678 100644 --- a/src/mesa/drivers/dri/r600/r700_oglprog.h +++ b/src/mesa/drivers/dri/r600/r700_oglprog.h @@ -27,7 +27,7 @@ #ifndef _R700_OGLPROG_H_ #define _R700_OGLPROG_H_ -#include "r600_context.h" +#include "main/dd.h" extern void r700InitShaderFuncs(struct dd_function_table *functions); -- cgit v1.2.3