diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /src/mesa/drivers/dri/nouveau/nouveau_context.h | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h index efe3e5148b..682f8a414e 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h @@ -56,12 +56,6 @@ struct nouveau_hw_state { struct nouveau_grobj *sifm; }; -struct nouveau_drawable_state { - GLboolean dirty; - unsigned int d_stamp; - unsigned int r_stamp; -}; - struct nouveau_context { GLcontext base; __DRIcontext *dri_context; @@ -73,7 +67,6 @@ struct nouveau_context { struct nouveau_hw_state hw; struct nouveau_bo_state bo; struct nouveau_render_state render; - struct nouveau_drawable_state drawable; }; #define to_nouveau_context(ctx) ((struct nouveau_context *)(ctx)) @@ -107,9 +100,11 @@ nouveau_context_deinit(GLcontext *ctx); void nouveau_context_destroy(__DRIcontext *dri_ctx); +void +nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw); + GLboolean -nouveau_context_make_current(__DRIcontext *dri_ctx, - __DRIdrawable *ddraw, +nouveau_context_make_current(__DRIcontext *dri_ctx, __DRIdrawable *ddraw, __DRIdrawable *rdraw); GLboolean |