diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-03-08 22:19:48 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-03-18 09:43:22 +0800 |
| commit | bd1ce874728c06d08a1f9881f51edbdd2f1c9db0 (patch) | |
| tree | 2a45880ccbae7208ad8cd9d2db8a7d01aa37de4c /src/gallium/state_trackers/dri/dri_drawable.h | |
| parent | 5ff21634f3074122ed8b8e4019c8092e31be0335 (diff) | |
| download | external_mesa3d-bd1ce874728c06d08a1f9881f51edbdd2f1c9db0.zip external_mesa3d-bd1ce874728c06d08a1f9881f51edbdd2f1c9db0.tar.gz external_mesa3d-bd1ce874728c06d08a1f9881f51edbdd2f1c9db0.tar.bz2 | |
st/dri: Switch from st_public.h to st_api.h.
This is tested with demos found in progs/demos. However, only the DRI2
path is tested.
Diffstat (limited to 'src/gallium/state_trackers/dri/dri_drawable.h')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/gallium/state_trackers/dri/dri_drawable.h b/src/gallium/state_trackers/dri/dri_drawable.h index ea66c48..7f687b6 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.h +++ b/src/gallium/state_trackers/dri/dri_drawable.h @@ -46,20 +46,15 @@ struct dri_drawable __DRIdrawable *dPriv; __DRIscreen *sPriv; - unsigned attachments[8]; - unsigned num_attachments; - - boolean is_pixmap; + /* gallium */ + struct st_framebuffer_iface *stfb; + struct st_visual stvis; __DRIbuffer old[8]; unsigned old_num; unsigned old_w; unsigned old_h; - /* gallium */ - struct st_framebuffer *stfb; - struct st_visual stvis; - struct pipe_texture *textures[ST_ATTACHMENT_COUNT]; unsigned int texture_mask, texture_stamp; @@ -69,8 +64,8 @@ struct dri_drawable unsigned int desired_fences; unsigned int cur_fences; - enum pipe_format color_format; - enum pipe_format depth_stencil_format; + /* used only by DRI1 */ + struct pipe_surface *dri1_surface; }; static INLINE struct dri_drawable * @@ -87,15 +82,6 @@ dri_create_buffer(__DRIscreen * sPriv, __DRIdrawable * dPriv, const __GLcontextModes * visual, boolean isPixmap); -void -dri_update_buffer(struct pipe_screen *screen, void *context_private); - -void -dri_flush_frontbuffer(struct pipe_screen *screen, - struct pipe_surface *surf, void *context_private); - -void dri_get_buffers(__DRIdrawable * dPriv); - void dri_destroy_buffer(__DRIdrawable * dPriv); void dri2_set_tex_buffer2(__DRIcontext *pDRICtx, GLint target, |