diff options
| author | Pauli Nieminen <suokkos@gmail.com> | 2009-08-25 02:36:13 +0300 |
|---|---|---|
| committer | Pauli Nieminen <suokkos@gmail.com> | 2009-08-25 02:36:13 +0300 |
| commit | ce7ed63f0c2f5cb1c030f73a5d8f6544eaac0f81 (patch) | |
| tree | 7554a2723fabb39037101724e5f179b70bb5a948 /src/gallium/state_trackers/xorg/xorg_exa.h | |
| parent | 4297f32c246cc5b726d02745456c06952322958d (diff) | |
| parent | 1d5a06a1f7812c055db1d724e40d21a0e3686dd1 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_exa.h')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_exa.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.h b/src/gallium/state_trackers/xorg/xorg_exa.h index f0508eb2d5..0189eabaa4 100644 --- a/src/gallium/state_trackers/xorg/xorg_exa.h +++ b/src/gallium/state_trackers/xorg/xorg_exa.h @@ -3,25 +3,28 @@ #include "xorg_tracker.h" +struct cso_context; + struct exa_context { - ExaDriverPtr pExa; - struct pipe_context *ctx; - struct pipe_screen *scrn; + ExaDriverPtr pExa; + struct pipe_context *ctx; + struct pipe_screen *scrn; + struct cso_context *cso; }; struct exa_pixmap_priv { - int flags; - int tex_flags; + int flags; + int tex_flags; - struct pipe_texture *tex; - unsigned int color; - struct pipe_surface *src_surf; /* for copies */ + struct pipe_texture *tex; + unsigned int color; + struct pipe_surface *src_surf; /* for copies */ - struct pipe_transfer *map_transfer; - unsigned map_count; + struct pipe_transfer *map_transfer; + unsigned map_count; }; |