summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorMaciej Cencora <m.cencora@gmail.com>2010-07-12 23:42:06 +0200
committerMaciej Cencora <m.cencora@gmail.com>2010-07-12 23:42:06 +0200
commit7facb8f2c8aa4a59aac20bd571f76097634092e9 (patch)
tree8afcbe9ca0ad20fa0355b9ae328b5f658d9e4c38 /src/gallium
parentba03a0b5ba73bc8e79d0ffa6d1da623544716f74 (diff)
parentc6b7aa96f9c1f2cf5d23512e808ee4023fc2674d (diff)
Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r300/r300_emit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index e1cb2bf501..59a3cea1c3 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"