projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_lock.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_lock.c
b/src/mesa/drivers/dri/mach64/mach64_lock.c
index 8653c77da573ba4b78999570998090fe83455d84..1a95a8f619d02b14fd18c89b0d9347a86fe2120d 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_lock.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_lock.c
@@
-32,7
+32,6
@@
#include "mach64_context.h"
#include "mach64_state.h"
#include "mach64_lock.h"
-#include "mach64_tex.h"
#include "drirenderbuffer.h"
#if DEBUG_LOCKING