g3dvl: Rework the decoder interface part 3/5
[mesa.git] / src / gallium / auxiliary / vl / vl_vertex_buffers.c
index 8599ed3533dc64fb1cc7895487c8cbca848d2117..b7aa14bb4dbafedc5eb4c748f99f8c547f83c8c8 100644 (file)
  **************************************************************************/
 
 #include <assert.h>
-#include <pipe/p_context.h>
-#include <pipe/p_screen.h>
-#include <util/u_memory.h>
-#include <util/u_inlines.h>
 #include <util/u_format.h>
 #include "vl_vertex_buffers.h"
 #include "vl_types.h"
 
 /* vertices for a quad covering a block */
-static const struct quadf const_quad = {
-   {0.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}
+static const struct vertex2f block_quad[4] = {
+   {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}
 };
 
 struct pipe_vertex_buffer
-vl_vb_upload_quads(struct pipe_context *pipe, unsigned max_blocks)
+vl_vb_upload_quads(struct pipe_context *pipe)
 {
    struct pipe_vertex_buffer quad;
    struct pipe_transfer *buf_transfer;
-   struct quadf *v;
+   struct vertex2f *v;
 
    unsigned i;
 
    assert(pipe);
-   assert(max_blocks);
 
    /* create buffer */
    quad.stride = sizeof(struct vertex2f);
-   quad.max_index = 4 * max_blocks - 1;
    quad.buffer_offset = 0;
    quad.buffer = pipe_buffer_create
    (
       pipe->screen,
       PIPE_BIND_VERTEX_BUFFER,
-      sizeof(struct vertex2f) * 4 * max_blocks
+      PIPE_USAGE_STATIC,
+      sizeof(struct vertex2f) * 4
    );
 
    if(!quad.buffer)
@@ -74,15 +69,106 @@ vl_vb_upload_quads(struct pipe_context *pipe, unsigned max_blocks)
       &buf_transfer
    );
 
-   for ( i = 0; i < max_blocks; ++i)
-     memcpy(v + i, &const_quad, sizeof(const_quad));
+   for (i = 0; i < 4; ++i, ++v) {
+      v->x = block_quad[i].x;
+      v->y = block_quad[i].y;
+   }
 
    pipe_buffer_unmap(pipe, buf_transfer);
 
    return quad;
 }
 
-struct pipe_vertex_element
+struct pipe_vertex_buffer
+vl_vb_upload_pos(struct pipe_context *pipe, unsigned width, unsigned height)
+{
+   struct pipe_vertex_buffer pos;
+   struct pipe_transfer *buf_transfer;
+   struct vertex2s *v;
+
+   unsigned x, y;
+
+   assert(pipe);
+
+   /* create buffer */
+   pos.stride = sizeof(struct vertex2s);
+   pos.buffer_offset = 0;
+   pos.buffer = pipe_buffer_create
+   (
+      pipe->screen,
+      PIPE_BIND_VERTEX_BUFFER,
+      PIPE_USAGE_STATIC,
+      sizeof(struct vertex2s) * width * height
+   );
+
+   if(!pos.buffer)
+      return pos;
+
+   /* and fill it */
+   v = pipe_buffer_map
+   (
+      pipe,
+      pos.buffer,
+      PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+      &buf_transfer
+   );
+
+   for ( y = 0; y < height; ++y) {
+      for ( x = 0; x < width; ++x, ++v) {
+         v->x = x;
+         v->y = y;
+      }
+   }
+
+   pipe_buffer_unmap(pipe, buf_transfer);
+
+   return pos;
+}
+
+struct pipe_vertex_buffer
+vl_vb_upload_block_num(struct pipe_context *pipe, unsigned num_blocks)
+{
+   struct pipe_vertex_buffer buf;
+   struct pipe_transfer *buf_transfer;
+   struct vertex2s *v;
+   unsigned i;
+
+   assert(pipe);
+
+   /* create buffer */
+   buf.stride = sizeof(struct vertex2s);
+   buf.buffer_offset = 0;
+   buf.buffer = pipe_buffer_create
+   (
+      pipe->screen,
+      PIPE_BIND_VERTEX_BUFFER,
+      PIPE_USAGE_STATIC,
+      sizeof(struct vertex2s) * num_blocks
+   );
+
+   if(!buf.buffer)
+      return buf;
+
+   /* and fill it */
+   v = pipe_buffer_map
+   (
+      pipe,
+      buf.buffer,
+      PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+      &buf_transfer
+   );
+
+   for ( i = 0; i < num_blocks; ++i, ++v) {
+      v->x = i;
+      v->y = i;
+   }
+
+   pipe_buffer_unmap(pipe, buf_transfer);
+
+   return buf;
+}
+
+static struct pipe_vertex_element
 vl_vb_get_quad_vertex_element(void)
 {
    struct pipe_vertex_element element;
@@ -96,48 +182,151 @@ vl_vb_get_quad_vertex_element(void)
    return element;
 }
 
-unsigned
+static void
 vl_vb_element_helper(struct pipe_vertex_element* elements, unsigned num_elements,
-                              unsigned vertex_buffer_index)
+                     unsigned vertex_buffer_index)
 {
-   unsigned i, size, offset = 0;
+   unsigned i, offset = 0;
 
    assert(elements && num_elements);
 
    for ( i = 0; i < num_elements; ++i ) {
       elements[i].src_offset = offset;
-      elements[i].instance_divisor = 0;
+      elements[i].instance_divisor = 1;
       elements[i].vertex_buffer_index = vertex_buffer_index;
       offset += util_format_get_blocksize(elements[i].src_format);
    }
+}
+
+void *
+vl_vb_get_ves_ycbcr(struct pipe_context *pipe)
+{
+   struct pipe_vertex_element vertex_elems[NUM_VS_INPUTS];
+
+   assert(pipe);
+
+   memset(&vertex_elems, 0, sizeof(vertex_elems));
+   vertex_elems[VS_I_RECT] = vl_vb_get_quad_vertex_element();
+
+   /* Position element */
+   vertex_elems[VS_I_VPOS].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
 
-   return offset;
+   vl_vb_element_helper(&vertex_elems[VS_I_VPOS], 1, 1);
+
+   /* block num element */
+   vertex_elems[VS_I_BLOCK_NUM].src_format = PIPE_FORMAT_R16G16_SSCALED;
+
+   vl_vb_element_helper(&vertex_elems[VS_I_BLOCK_NUM], 1, 2);
+
+   return pipe->create_vertex_elements_state(pipe, 3, vertex_elems);
 }
 
-struct pipe_vertex_buffer
+void *
+vl_vb_get_ves_mv(struct pipe_context *pipe)
+{
+   struct pipe_vertex_element vertex_elems[NUM_VS_INPUTS];
+
+   assert(pipe);
+
+   memset(&vertex_elems, 0, sizeof(vertex_elems));
+   vertex_elems[VS_I_RECT] = vl_vb_get_quad_vertex_element();
+
+   /* Position element */
+   vertex_elems[VS_I_VPOS].src_format = PIPE_FORMAT_R16G16_SSCALED;
+
+   vl_vb_element_helper(&vertex_elems[VS_I_VPOS], 1, 1);
+
+   /* motion vector TOP element */
+   vertex_elems[VS_I_MV_TOP].src_format = PIPE_FORMAT_R16G16B16A16_SSCALED;
+
+   /* motion vector BOTTOM element */
+   vertex_elems[VS_I_MV_BOTTOM].src_format = PIPE_FORMAT_R16G16B16A16_SSCALED;
+
+   vl_vb_element_helper(&vertex_elems[VS_I_MV_TOP], 2, 2);
+
+   return pipe->create_vertex_elements_state(pipe, NUM_VS_INPUTS, vertex_elems);
+}
+
+bool
 vl_vb_init(struct vl_vertex_buffer *buffer, struct pipe_context *pipe,
-           unsigned max_blocks, unsigned stride)
+           unsigned width, unsigned height)
 {
-   struct pipe_vertex_buffer buf;
+   unsigned i, size;
 
    assert(buffer);
 
-   buffer->num_verts = 0;
-   buffer->stride = stride;
+   buffer->width = width;
+   buffer->height = height;
+
+   size = width * height;
+
+   for (i = 0; i < VL_MAX_PLANES; ++i) {
+      buffer->ycbcr[i].resource = pipe_buffer_create
+      (
+         pipe->screen,
+         PIPE_BIND_VERTEX_BUFFER,
+         PIPE_USAGE_STREAM,
+         sizeof(struct vl_ycbcr_block) * size * 4
+      );
+      if (!buffer->ycbcr[i].resource)
+         goto error_ycbcr;
+   }
+
+   for (i = 0; i < VL_MAX_REF_FRAMES; ++i) {
+      buffer->mv[i].resource = pipe_buffer_create
+      (
+         pipe->screen,
+         PIPE_BIND_VERTEX_BUFFER,
+         PIPE_USAGE_STREAM,
+         sizeof(struct vl_motionvector) * size
+      );
+      if (!buffer->mv[i].resource)
+         goto error_mv;
+   }
+
+   vl_vb_map(buffer, pipe);
+   return true;
+
+error_mv:
+   for (i = 0; i < VL_MAX_PLANES; ++i)
+      pipe_resource_reference(&buffer->mv[i].resource, NULL);
+
+error_ycbcr:
+   for (i = 0; i < VL_MAX_PLANES; ++i)
+      pipe_resource_reference(&buffer->ycbcr[i].resource, NULL);
+   return false;
+}
+
+unsigned
+vl_vb_attributes_per_plock(struct vl_vertex_buffer *buffer)
+{
+   return 1;
+}
 
-   buf.stride = stride;
-   buf.max_index = 4 * max_blocks - 1;
+struct pipe_vertex_buffer
+vl_vb_get_ycbcr(struct vl_vertex_buffer *buffer, int component)
+{
+   struct pipe_vertex_buffer buf;
+
+   assert(buffer);
+
+   buf.stride = sizeof(struct vl_ycbcr_block);
    buf.buffer_offset = 0;
-   buf.buffer = pipe_buffer_create
-   (
-      pipe->screen,
-      PIPE_BIND_VERTEX_BUFFER,
-      stride * 4 * max_blocks
-   );
+   buf.buffer = buffer->ycbcr[component].resource;
 
-   pipe_resource_reference(&buffer->resource, buf.buffer);
+   return buf;
+}
 
-   vl_vb_map(buffer, pipe);
+struct pipe_vertex_buffer
+vl_vb_get_mv(struct vl_vertex_buffer *buffer, int motionvector)
+{
+   struct pipe_vertex_buffer buf;
+
+   assert(buffer);
+
+   buf.stride = sizeof(struct vl_motionvector);
+   buf.buffer_offset = 0;
+   buf.buffer = buffer->mv[motionvector].resource;
 
    return buf;
 }
@@ -145,39 +334,86 @@ vl_vb_init(struct vl_vertex_buffer *buffer, struct pipe_context *pipe,
 void
 vl_vb_map(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
 {
+   unsigned i;
+
    assert(buffer && pipe);
 
-   buffer->vectors = pipe_buffer_map
-   (
-      pipe,
-      buffer->resource,
-      PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
-      &buffer->transfer
-   );
+   for (i = 0; i < VL_MAX_PLANES; ++i) {
+      buffer->ycbcr[i].vertex_stream = pipe_buffer_map
+      (
+         pipe,
+         buffer->ycbcr[i].resource,
+         PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+         &buffer->ycbcr[i].transfer
+      );
+   }
+
+   for (i = 0; i < VL_MAX_REF_FRAMES; ++i) {
+      buffer->mv[i].vertex_stream = pipe_buffer_map
+      (
+         pipe,
+         buffer->mv[i].resource,
+         PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+         &buffer->mv[i].transfer
+      );
+   }
+
 }
 
-void
-vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
+struct vl_ycbcr_block *
+vl_vb_get_ycbcr_stream(struct vl_vertex_buffer *buffer, int component)
 {
-   assert(buffer && pipe);
+   assert(buffer);
+   assert(component < VL_MAX_PLANES);
 
-   pipe_buffer_unmap(pipe, buffer->transfer);
+   return buffer->ycbcr[component].vertex_stream;
 }
 
 unsigned
-vl_vb_restart(struct vl_vertex_buffer *buffer)
+vl_vb_get_mv_stream_stride(struct vl_vertex_buffer *buffer)
+{
+   assert(buffer);
+
+   return buffer->width;
+}
+
+struct vl_motionvector *
+vl_vb_get_mv_stream(struct vl_vertex_buffer *buffer, int ref_frame)
 {
    assert(buffer);
+   assert(ref_frame < VL_MAX_REF_FRAMES);
 
-   unsigned todo = buffer->num_verts;
-   buffer->num_verts = 0;
-   return todo;
+   return buffer->mv[ref_frame].vertex_stream;
+}
+
+void
+vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
+{
+   unsigned i;
+
+   assert(buffer && pipe);
+
+   for (i = 0; i < VL_MAX_PLANES; ++i) {
+      pipe_buffer_unmap(pipe, buffer->ycbcr[i].transfer);
+   }
+
+   for (i = 0; i < VL_MAX_REF_FRAMES; ++i) {
+      pipe_buffer_unmap(pipe, buffer->mv[i].transfer);
+   }
 }
 
 void
 vl_vb_cleanup(struct vl_vertex_buffer *buffer)
 {
+   unsigned i;
+
    assert(buffer);
 
-   pipe_resource_reference(&buffer->resource, NULL);
+   for (i = 0; i < VL_MAX_PLANES; ++i) {
+      pipe_resource_reference(&buffer->ycbcr[i].resource, NULL);
+   }
+
+   for (i = 0; i < VL_MAX_REF_FRAMES; ++i) {
+      pipe_resource_reference(&buffer->mv[i].resource, NULL);
+   }
 }