summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_vs.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2010-03-15 09:44:52 +0000
committerKeith Whitwell <[email protected]>2010-03-15 09:44:52 +0000
commit42910ebe7b9748c0ecb6a597bae3e7d43c7e170f (patch)
treeb2b9c72dc47a0473304dc2db1b078d13b658df34 /src/gallium/drivers/r300/r300_vs.c
parent47bfbd452c93e6a8db013fb90d9f42210cf24889 (diff)
parent68e58a96e80865878e6881dc4d34fcc3ec24eb19 (diff)
Merge commit 'origin/master' into gallium-sampler-view
Conflicts: src/gallium/drivers/nv30/nv30_context.h src/gallium/drivers/nv30/nv30_state.c src/gallium/drivers/nv40/nv40_context.h src/gallium/drivers/nv40/nv40_state.c src/gallium/drivers/r300/r300_emit.c
Diffstat (limited to 'src/gallium/drivers/r300/r300_vs.c')
-rw-r--r--src/gallium/drivers/r300/r300_vs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_vs.c b/src/gallium/drivers/r300/r300_vs.c
index 379939ac750..bd6b95dccba 100644
--- a/src/gallium/drivers/r300/r300_vs.c
+++ b/src/gallium/drivers/r300/r300_vs.c
@@ -34,8 +34,6 @@
#include "radeon_compiler.h"
-#include "util/u_math.h"
-
/* Convert info about VS output semantics into r300_shader_semantics. */
static void r300_shader_read_vs_outputs(
struct tgsi_shader_info* info,