diff options
| author | Jason Ekstrand <[email protected]> | 2015-11-14 07:56:10 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-11-14 07:56:10 -0800 |
| commit | 1469ccb7464836c752fa2664c36d8fae7e80606c (patch) | |
| tree | 6f15e2eeb7e16e4085a0c58d50a36a4c12b231a5 /src/gallium/drivers/nouveau/nouveau_context.h | |
| parent | e8f51fe4deb5082fece5f8cb167b89b0f03eb244 (diff) | |
| parent | f94e1d97381ec787c2abbbcd5265252596217e33 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in Matt's big compiler refactor.
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_context.h')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_context.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_context.h b/src/gallium/drivers/nouveau/nouveau_context.h index decb2714ede..c3bbb11bd60 100644 --- a/src/gallium/drivers/nouveau/nouveau_context.h +++ b/src/gallium/drivers/nouveau/nouveau_context.h @@ -2,6 +2,7 @@ #define __NOUVEAU_CONTEXT_H__ #include "pipe/p_context.h" +#include "pipe/p_state.h" #include <nouveau.h> #define NOUVEAU_MAX_SCRATCH_BUFS 4 @@ -14,6 +15,7 @@ struct nouveau_context { struct nouveau_client *client; struct nouveau_pushbuf *pushbuf; + struct pipe_debug_callback debug; bool vbo_dirty; @@ -64,6 +66,9 @@ void nouveau_context_init_vdec(struct nouveau_context *); void +nouveau_context_init(struct nouveau_context *); + +void nouveau_scratch_runout_release(struct nouveau_context *); /* This is needed because we don't hold references outside of context::scratch, |