diff options
| author | Maciej Cencora <[email protected]> | 2010-07-12 23:42:06 +0200 |
|---|---|---|
| committer | Maciej Cencora <[email protected]> | 2010-07-12 23:42:06 +0200 |
| commit | 7facb8f2c8aa4a59aac20bd571f76097634092e9 (patch) | |
| tree | 8afcbe9ca0ad20fa0355b9ae328b5f658d9e4c38 | |
| parent | ba03a0b5ba73bc8e79d0ffa6d1da623544716f74 (diff) | |
| parent | c6b7aa96f9c1f2cf5d23512e808ee4023fc2674d (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_oglprog.h | 2 |
2 files changed, 1 insertions, 2 deletions
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" 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); |