diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-10-22 19:27:34 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-10-22 19:27:34 -0700 |
| commit | 21c795b64d14dbd3496903ba5aaab196de2e7a2a (patch) | |
| tree | 6ab54c3279819342757dae4c3b7fd28d968dd819 /src/gallium/drivers/nv30/nv30_context.h | |
| parent | ea92bef2898bc3391407702b0843ebb9d5e083fc (diff) | |
| parent | 286611d99060c38c4cc12f18fde5448213e2a44b (diff) | |
Merge branch 'master' into asm-shader-rework-3asm-shader-rework-3
Conflicts:
src/mesa/shader/lex.yy.c
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_context.h')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_context.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h index 4229c0a0e1..8d49366dfc 100644 --- a/src/gallium/drivers/nv30/nv30_context.h +++ b/src/gallium/drivers/nv30/nv30_context.h @@ -13,6 +13,7 @@ #include "nouveau/nouveau_winsys.h" #include "nouveau/nouveau_gldefs.h" +#include "nouveau/nouveau_context.h" #define NOUVEAU_PUSH_CONTEXT(ctx) \ struct nv30_screen *ctx = nv30->screen |