projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/master' into nvc0-new
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
nouveau
/
nv04_state_tex.c
diff --git
a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
index 1fe47a30e45c2a0d610b9712af88d9fefa81415b..5ed8b147559bb9974774362cb90fa16f87e28857 100644
(file)
--- a/
src/mesa/drivers/dri/nouveau/nv04_state_tex.c
+++ b/
src/mesa/drivers/dri/nouveau/nv04_state_tex.c
@@
-29,7
+29,8
@@
#include "nouveau_texture.h"
#include "nouveau_util.h"
#include "nouveau_gldefs.h"
-#include "nouveau_class.h"
+#include "nv_object.xml.h"
+#include "nv04_3d.xml.h"
#include "nv04_driver.h"
static uint32_t