diff options
| author | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
| commit | 54f11a27a1ec28fcf9734f4454dee870bc0113f8 (patch) | |
| tree | 2dc71d95b1ad5d2ca966bbb6726fba45b4cfbac1 /src/gallium/drivers/nvfx | |
| parent | 0eccb1038a620bc76ba45ac00c293b3e88427510 (diff) | |
| parent | 6838c9ce74f16c765474c0d2b4ae1469dd4a64d5 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/nvfx')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_context.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index 2238aa1ad0e..dad912b2aee 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.h +++ b/src/gallium/drivers/nvfx/nvfx_context.h @@ -18,6 +18,7 @@ #include "nouveau/nouveau_winsys.h" #include "nouveau/nouveau_gldefs.h" +#include "nouveau/nouveau_resource.h" #include "nv30-40_3d.xml.h" #include "nvfx_state.h" |