Merge remote branch 'origin/master' into pipe-video

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

diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index 1a05f369d9b4d155c613527d854120bd5bb7ca12..d7b29497ace9a56dcfe626f05f3a8bd54435996e 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -32,6 +32,7 @@
 #include <util/u_inlines.h>
 #include <util/u_memory.h>
 #include <util/u_keymap.h>
+#include <util/u_draw.h>
 #include <util/u_sampler.h>
 #include <tgsi/tgsi_ureg.h>
 #include "vl_csc.h"
@@ -516,7 +517,7 @@ static unsigned gen_data(struct vl_compositor *c,
       }
    }
 
-   pipe_buffer_unmap(c->pipe, c->vertex_buf.buffer, buf_transfer);
+   pipe_buffer_unmap(c->pipe, buf_transfer);
 
    return num_rects;
 }
@@ -557,6 +558,7 @@ static void draw_layers(struct vl_compositor *c,
 
       c->pipe->bind_fs_state(c->pipe, frag_shaders[i]);
       c->pipe->set_fragment_sampler_views(c->pipe, 1, &surface_view);
+
       util_draw_arrays(c->pipe, PIPE_PRIM_TRIANGLES, i * 6, 6);
 
       if (delete_view) {
@@ -629,10 +631,9 @@ void vl_compositor_set_csc_matrix(struct vl_compositor *compositor, const float
       pipe_buffer_map(compositor->pipe, compositor->fs_const_buf,
                       PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
                       &buf_transfer),
-      mat,
-      sizeof(struct fragment_shader_consts)
+               mat,
+               sizeof(struct fragment_shader_consts)
    );
 
-   pipe_buffer_unmap(compositor->pipe, compositor->fs_const_buf,
-                     buf_transfer);
+   pipe_buffer_unmap(compositor->pipe, buf_transfer);
 }