Mesa (master): r600: Fix include recursion.

Vinson Lee vlee at kemper.freedesktop.org
Sat Jul 10 01:11:54 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Jul  9 18:09:26 2010 -0700

r600: Fix include recursion.

r700_chip.h included r600_context.h, which included r700_chip.h.

Remove the unnecessary r600_context.h inclusion and add missing
headers.

---

 src/mesa/drivers/dri/r600/r700_chip.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_chip.h b/src/mesa/drivers/dri/r600/r700_chip.h
index ae249e1..0b6b72f 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.h
+++ b/src/mesa/drivers/dri/r600/r700_chip.h
@@ -27,7 +27,9 @@
 #ifndef _R700_CHIP_H_
 #define _R700_CHIP_H_
 
-#include "r600_context.h"
+#include <GL/gl.h>
+
+#include "radeon_common_context.h"
 
 #include "r600_reg.h"
 #include "r600_reg_auto_r6xx.h"




More information about the mesa-commit mailing list