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
/
i965
/
brw_tex_layout.c
diff --git
a/src/mesa/drivers/dri/i965/brw_tex_layout.c
b/src/mesa/drivers/dri/i965/brw_tex_layout.c
index e437c411dde7e4a518933af83ec07fbfc1b4c218..51a617fcb400efb722eaa1b1ed6645dfc36fbe85 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_tex_layout.c
+++ b/
src/mesa/drivers/dri/i965/brw_tex_layout.c
@@
-36,7
+36,7
@@
#include "intel_mipmap_tree.h"
#include "intel_tex_layout.h"
#include "intel_context.h"
-#include "macros.h"
+#include "ma
in/ma
cros.h"
#define FILE_DEBUG_FLAG DEBUG_MIPTREE