diff options
author | Zack Rusin <zackr@vmware.com> | 2009-10-09 09:52:17 -0400 |
---|---|---|
committer | Zack Rusin <zackr@vmware.com> | 2009-10-11 20:02:47 -0400 |
commit | 319a588238b4c0c58f8f8807e1143ad79cd8f698 (patch) | |
tree | 215e02475c0f6a8eb0e4bb1fa56bce354bcf2c41 /src/gallium/state_trackers/xorg/xorg_exa.h | |
parent | 59ae3d51556229631f558f56268df89c885de664 (diff) |
st/xorg: lots of rendering and xv changes
extract all the rendering code to xorg_rendedrer, make both exa and xv
share that code. in the process cleanup the rendering code and implement
a lot more of the xv infrastructure.
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_exa.h')
-rw-r--r-- | src/gallium/state_trackers/xorg/xorg_exa.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.h b/src/gallium/state_trackers/xorg/xorg_exa.h index 28834e3ef5..292f964cec 100644 --- a/src/gallium/state_trackers/xorg/xorg_exa.h +++ b/src/gallium/state_trackers/xorg/xorg_exa.h @@ -16,11 +16,7 @@ struct exa_context ExaDriverPtr pExa; struct pipe_context *pipe; struct pipe_screen *scrn; - struct cso_context *cso; - struct xorg_shaders *shaders; - - struct pipe_constant_buffer vs_const_buffer; - struct pipe_constant_buffer fs_const_buffer; + struct xorg_renderer *renderer; struct pipe_texture *bound_textures[MAX_EXA_SAMPLERS]; int num_bound_samplers; @@ -32,10 +28,6 @@ struct exa_context struct exa_pixmap_priv *src; struct exa_pixmap_priv *dst; } copy; - - /* we should combine these two */ - float vertices2[4][2][4]; - float vertices3[4][3][4]; }; struct exa_pixmap_priv @@ -60,7 +52,7 @@ do { \ } while(0) struct pipe_surface * -exa_gpu_surface(struct exa_context *exa, struct exa_pixmap_priv *priv); +xorg_gpu_surface(struct pipe_screen *scrn, struct exa_pixmap_priv *priv); void xorg_exa_flush(struct exa_context *exa, uint pipeFlushFlags, struct pipe_fence_handle **fence); |