Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa

2010-07-12 23:42:06 +02:00
parent ba03a0b5ba c6b7aa96f9
commit 7facb8f2c8
2 changed files with 1 additions and 2 deletions
@@ -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"

@@ -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);