projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_texmem.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_texmem.c
b/src/mesa/drivers/dri/mach64/mach64_texmem.c
index d65b2cda6ad90bf02db01c91b239e1fc35051abd..734e547952ec063aee6734f64328d8acbc015a69 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_texmem.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_texmem.c
@@
-38,11
+38,11
@@
#include "mach64_tris.h"
#include "mach64_tex.h"
#include "mach64_tris.h"
#include "mach64_tex.h"
-#include "context.h"
-#include "macros.h"
-#include "simple_list.h"
-#include "texformat.h"
-#include "imports.h"
+#include "
main/
context.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
simple_list.h"
+#include "
main/
texformat.h"
+#include "
main/
imports.h"
/* Destroy hardware state associated with texture `t'.
/* Destroy hardware state associated with texture `t'.