Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

[mesa.git] / src / gallium / auxiliary / vl / vl_compositor.h

diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h
index 3b1e809b868302fbe0e5157cbd8c22398a15cf89..4b0cdd6be5f832b831099b0ac26c5d0df078528d 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_compositor.h
+++ b/src/gallium/auxiliary/vl/vl_compositor.h
@@ -44,12 +44,13 @@ struct vl_compositor
    struct pipe_framebuffer_state fb_state;
    struct vertex2f fb_inv_size;
    void *sampler;
+   struct pipe_sampler_view *sampler_view;
    void *vertex_shader;
    void *fragment_shader;
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buf;
-   struct pipe_vertex_element vertex_elems[2];
-   struct pipe_buffer *fs_const_buf;
+   void *vertex_elems_state;
+   struct pipe_resource *fs_const_buf;
 
    struct pipe_surface *bg;
    struct pipe_video_rect bg_src_rect;