Merge remote branch 'origin/master' 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 86f8343659ed59d5f0b308689b466774dd94ed0f..a75223c773fc5ed6267f47004b7d8e0c46eb6fdc 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_compositor.h
+++ b/src/gallium/auxiliary/vl/vl_compositor.h
@@ -50,7 +50,7 @@ struct vl_compositor
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buf;
    struct pipe_vertex_element vertex_elems[2];
-   struct pipe_constant_buffer fs_const_buf;
+   struct pipe_buffer *fs_const_buf;
 
    struct pipe_texture *bg;
    struct pipe_video_rect bg_src_rect;