Mesa (master): r300g: fix scons build

Marek Olšák mareko at kemper.freedesktop.org
Sun Feb 14 02:22:00 UTC 2010


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Feb 14 03:14:32 2010 +0100

r300g: fix scons build

---

 src/gallium/drivers/r300/r300_context.c |    3 ++-
 src/gallium/drivers/r300/r300_winsys.h  |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 14820ca..f631b4e 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -34,7 +34,8 @@
 #include "r300_screen.h"
 #include "r300_state_invariant.h"
 #include "r300_texture.h"
-#include "r300_winsys.h"
+
+#include "radeon_winsys.h"
 
 static void r300_destroy_context(struct pipe_context* context)
 {
diff --git a/src/gallium/drivers/r300/r300_winsys.h b/src/gallium/drivers/r300/r300_winsys.h
index f4a8ae1..40fb8a9 100644
--- a/src/gallium/drivers/r300/r300_winsys.h
+++ b/src/gallium/drivers/r300/r300_winsys.h
@@ -33,9 +33,8 @@ extern "C" {
 
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
-#include "util/u_simple_screen.h"
 
-#include "radeon_winsys.h"
+struct radeon_winsys;
 
 /* Creates a new r300 screen. */
 struct pipe_screen* r300_create_screen(struct radeon_winsys* radeon_winsys);




More information about the mesa-commit mailing list