**************************************************************************/
#include <assert.h>
-#include <util/u_format.h>
+#include "util/u_format.h"
#include "vl_vertex_buffers.h"
#include "vl_types.h"
-struct vl_vertex_stream
-{
- struct vertex2s pos;
- uint8_t mb_type_intra;
- uint8_t dct_type_field;
- uint8_t dummy[2];
- uint8_t eb[3][2][2];
- struct vertex4s mv[4];
-};
-
/* vertices for a quad covering a block */
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 blocks_x, unsigned blocks_y)
+vl_vb_upload_quads(struct pipe_context *pipe)
{
struct pipe_vertex_buffer quad;
struct pipe_transfer *buf_transfer;
- struct vertex4f *v;
+ struct vertex2f *v;
- unsigned x, y, i;
+ unsigned i;
assert(pipe);
/* create buffer */
- quad.stride = sizeof(struct vertex4f);
+ quad.stride = sizeof(struct vertex2f);
quad.buffer_offset = 0;
quad.buffer = pipe_buffer_create
(
pipe->screen,
PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC,
- sizeof(struct vertex4f) * 4 * blocks_x * blocks_y
+ sizeof(struct vertex2f) * 4
);
if(!quad.buffer)
&buf_transfer
);
- for ( y = 0; y < blocks_y; ++y) {
- for ( x = 0; x < blocks_x; ++x) {
- for (i = 0; i < 4; ++i, ++v) {
- v->x = block_quad[i].x;
- v->y = block_quad[i].y;
+ 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_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;
- v->z = x;
- v->w = y;
- }
+ /* 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 quad;
+ return pos;
}
static struct pipe_vertex_element
element.src_offset = 0;
element.instance_divisor = 0;
element.vertex_buffer_index = 0;
- element.src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+ element.src_format = PIPE_FORMAT_R32G32_FLOAT;
return element;
}
static void
vl_vb_element_helper(struct pipe_vertex_element* elements, unsigned num_elements,
- unsigned vertex_buffer_index)
+ unsigned vertex_buffer_index)
{
unsigned i, offset = 0;
assert(elements && num_elements);
for ( i = 0; i < num_elements; ++i ) {
- if (elements[i].src_offset)
- offset = elements[i].src_offset;
- else
- elements[i].src_offset = offset;
+ elements[i].src_offset = offset;
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_eb(struct pipe_context *pipe, int component)
+vl_vb_get_ves_ycbcr(struct pipe_context *pipe)
{
struct pipe_vertex_element vertex_elems[NUM_VS_INPUTS];
vertex_elems[VS_I_RECT] = vl_vb_get_quad_vertex_element();
/* Position element */
- vertex_elems[VS_I_VPOS].src_format = PIPE_FORMAT_R16G16_SSCALED;
-
- /* flags */
- vertex_elems[VS_I_FLAGS].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
+ vertex_elems[VS_I_VPOS].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
- /* empty block element of selected component */
- vertex_elems[VS_I_EB].src_offset = offsetof(struct vl_vertex_stream, eb[component]);
- vertex_elems[VS_I_EB].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
+ /* block num element */
+ vertex_elems[VS_I_BLOCK_NUM].src_format = PIPE_FORMAT_R32_FLOAT;
- vl_vb_element_helper(&vertex_elems[VS_I_VPOS], NUM_VS_INPUTS - 1, 1);
+ vl_vb_element_helper(&vertex_elems[VS_I_VPOS], 2, 1);
- return pipe->create_vertex_elements_state(pipe, NUM_VS_INPUTS, vertex_elems);
+ return pipe->create_vertex_elements_state(pipe, 3, vertex_elems);
}
void *
-vl_vb_get_ves_mv(struct pipe_context *pipe, int motionvector)
+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();
- assert(pipe);
-
/* 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_offset = offsetof(struct vl_vertex_stream, mv[motionvector * 2]);
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_VPOS], NUM_VS_INPUTS - 1, 1);
+ 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 width, unsigned height)
+{
+ unsigned i, size;
+
+ assert(buffer);
+
+ 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;
+}
+
struct pipe_vertex_buffer
-vl_vb_init(struct vl_vertex_buffer *buffer, struct pipe_context *pipe, unsigned size)
+vl_vb_get_ycbcr(struct vl_vertex_buffer *buffer, int component)
{
struct pipe_vertex_buffer buf;
assert(buffer);
- buffer->size = size;
- buffer->num_not_empty = 0;
- buffer->num_empty = 0;
-
- buf.stride = sizeof(struct vl_vertex_stream);
+ buf.stride = sizeof(struct vl_ycbcr_block);
buf.buffer_offset = 0;
- buf.buffer = pipe_buffer_create
- (
- pipe->screen,
- PIPE_BIND_VERTEX_BUFFER,
- PIPE_USAGE_STREAM,
- sizeof(struct vl_vertex_stream) * size
- );
+ buf.buffer = buffer->ycbcr[component].resource;
+
+ return buf;
+}
- pipe_resource_reference(&buffer->resource, buf.buffer);
+struct pipe_vertex_buffer
+vl_vb_get_mv(struct vl_vertex_buffer *buffer, int motionvector)
+{
+ struct pipe_vertex_buffer buf;
- vl_vb_map(buffer, pipe);
+ assert(buffer);
+
+ buf.stride = sizeof(struct vl_motionvector);
+ buf.buffer_offset = 0;
+ buf.buffer = buffer->mv[motionvector].resource;
return buf;
}
void
vl_vb_map(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
{
+ unsigned i;
+
assert(buffer && pipe);
- buffer->start = pipe_buffer_map
- (
- pipe,
- buffer->resource,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
- &buffer->transfer
- );
- buffer->end = buffer->start + buffer->resource->width0 / sizeof(struct vl_vertex_stream);
-}
+ 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
+ );
+ }
-static void
-get_motion_vectors(struct pipe_mpeg12_macroblock *mb, struct vertex4s mv[4])
-{
- if (mb->mo_type == PIPE_MPEG12_MOTION_TYPE_FRAME) {
- mv[0].x = mv[1].x = mb->mv[0].top.x;
- mv[0].y = mv[1].y = mb->mv[0].top.y;
- mv[0].z = mv[1].z = 0;
-
- mv[2].x = mv[3].x = mb->mv[1].top.x;
- mv[2].y = mv[3].y = mb->mv[1].top.y;
- mv[2].z = mv[3].z = 0;
-
- } else {
- mv[0].x = mb->mv[0].top.x;
- mv[0].y = mb->mv[0].top.y;
- mv[0].z = mb->mv[0].top.field_select ? 3 : 1;
-
- mv[1].x = mb->mv[0].bottom.x;
- mv[1].y = mb->mv[0].bottom.y;
- mv[1].z = mb->mv[0].bottom.field_select ? 3 : 1;
-
- mv[2].x = mb->mv[1].top.x;
- mv[2].y = mb->mv[1].top.y;
- mv[2].z = mb->mv[1].top.field_select ? 3 : 1;
-
- mv[3].x = mb->mv[1].bottom.x;
- mv[3].y = mb->mv[1].bottom.y;
- mv[3].z = mb->mv[1].bottom.field_select ? 3 : 1;
+ 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
+ );
}
- mv[0].w = mv[1].w = mb->mv[0].wheight;
- mv[2].w = mv[3].w = mb->mv[1].wheight;
}
-void
-vl_vb_add_block(struct vl_vertex_buffer *buffer, struct pipe_mpeg12_macroblock *mb,
- const unsigned (*empty_block_mask)[3][2][2])
+struct vl_ycbcr_block *
+vl_vb_get_ycbcr_stream(struct vl_vertex_buffer *buffer, int component)
{
- struct vl_vertex_stream *stream;
- unsigned i, j, k;
-
assert(buffer);
- assert(mb);
- assert(buffer->num_not_empty + buffer->num_empty < buffer->size);
-
- if(mb->cbp)
- stream = buffer->start + buffer->num_not_empty++;
- else
- stream = buffer->end - ++buffer->num_empty;
+ assert(component < VL_MAX_PLANES);
- stream->pos.x = mb->mbx;
- stream->pos.y = mb->mby;
-
- for ( i = 0; i < 3; ++i)
- for ( j = 0; j < 2; ++j)
- for ( k = 0; k < 2; ++k)
- stream->eb[i][j][k] = !(mb->cbp & (*empty_block_mask)[i][j][k]);
+ return buffer->ycbcr[component].vertex_stream;
+}
- stream->dct_type_field = mb->dct_type == PIPE_MPEG12_DCT_TYPE_FIELD;
- stream->mb_type_intra = mb->dct_intra;
+unsigned
+vl_vb_get_mv_stream_stride(struct vl_vertex_buffer *buffer)
+{
+ assert(buffer);
- get_motion_vectors(mb, stream->mv);
+ return buffer->width;
}
-void
-vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
+struct vl_motionvector *
+vl_vb_get_mv_stream(struct vl_vertex_buffer *buffer, int ref_frame)
{
- assert(buffer && pipe);
+ assert(buffer);
+ assert(ref_frame < VL_MAX_REF_FRAMES);
- pipe_buffer_unmap(pipe, buffer->transfer);
+ return buffer->mv[ref_frame].vertex_stream;
}
void
-vl_vb_restart(struct vl_vertex_buffer *buffer,
- unsigned *not_empty_start_instance, unsigned *not_empty_num_instances,
- unsigned *empty_start_instance, unsigned *empty_num_instances)
+vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
{
- assert(buffer);
+ unsigned i;
+
+ assert(buffer && pipe);
- *not_empty_start_instance = 0;
- *not_empty_num_instances = buffer->num_not_empty;
- *empty_start_instance = buffer->size - buffer->num_empty;
- *empty_num_instances = buffer->num_empty;
+ for (i = 0; i < VL_MAX_PLANES; ++i) {
+ pipe_buffer_unmap(pipe, buffer->ycbcr[i].transfer);
+ }
- buffer->num_not_empty = 0;
- buffer->num_empty = 0;
+ 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);
+ }
}
projects / mesa.git / blobdiff