summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau/nv04_context.h
diff options
context:
space:
mode:
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>2010-12-19 21:46:33 +0100
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>2010-12-19 21:46:33 +0100
commit0f68236a2487dbeb0396b996debcda595b0b54a1 (patch)
tree938ae3b779349b6dba6f5a891550604f9a9ca895 /src/mesa/drivers/dri/nouveau/nv04_context.h
parentd047168d81cfeb39a98f3ae16416872facc6237c (diff)
parent237880463d5168cad8df0bae6018b5fd76617777 (diff)
Merge remote branch 'origin/master' into nvc0-new
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv04_context.h')
-rw-r--r--src/mesa/drivers/dri/nouveau/nv04_context.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.h b/src/mesa/drivers/dri/nouveau/nv04_context.h
index 45e70d2bc3..960a6550dc 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_context.h
+++ b/src/mesa/drivers/dri/nouveau/nv04_context.h
@@ -28,6 +28,7 @@
#define __NV04_CONTEXT_H__
#include "nouveau_context.h"
+#include "nv_object.xml.h"
struct nv04_context {
struct nouveau_context base;