**************************************************************************/
#include <assert.h>
-#include <util/u_format.h>
+#include "util/u_format.h"
#include "vl_vertex_buffers.h"
#include "vl_types.h"
-struct vl_ycbcr_vertex_stream
-{
- struct vertex2s pos;
- uint8_t mb_type_intra;
- uint8_t dct_type_field;
- uint8_t dummy[2];
- uint8_t eb[2][2];
-};
-
-struct vl_mv_vertex_stream
-{
- struct vertex4s mv[2];
-};
-
/* 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
);
+ quad.user_buffer = NULL;
if(!quad.buffer)
return quad;
(
pipe,
quad.buffer,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&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;
-
- v->z = x;
- v->w = 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);
PIPE_USAGE_STATIC,
sizeof(struct vertex2s) * width * height
);
+ pos.user_buffer = NULL;
if(!pos.buffer)
return pos;
(
pipe,
pos.buffer,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buf_transfer
);
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;
vertex_elems[VS_I_RECT] = vl_vb_get_quad_vertex_element();
/* Position element */
- vertex_elems[VS_I_VPOS].src_format = PIPE_FORMAT_R16G16_SSCALED;
+ vertex_elems[VS_I_VPOS].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
- /* flags */
- vertex_elems[VS_I_FLAGS].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
+ /* block num element */
+ vertex_elems[VS_I_BLOCK_NUM].src_format = PIPE_FORMAT_R32_FLOAT;
- /* empty block element of selected component */
- vertex_elems[VS_I_EB].src_format = PIPE_FORMAT_R8G8B8A8_USCALED;
+ vl_vb_element_helper(&vertex_elems[VS_I_VPOS], 2, 1);
- vl_vb_element_helper(&vertex_elems[VS_I_VPOS], NUM_VS_INPUTS - 1, 1);
-
- return pipe->create_vertex_elements_state(pipe, NUM_VS_INPUTS, vertex_elems);
+ return pipe->create_vertex_elements_state(pipe, 3, vertex_elems);
}
void *
return pipe->create_vertex_elements_state(pipe, NUM_VS_INPUTS, vertex_elems);
}
-void
-vl_vb_init(struct vl_vertex_buffer *buffer, struct pipe_context *pipe, unsigned width, unsigned height)
+bool
+vl_vb_init(struct vl_vertex_buffer *buffer, struct pipe_context *pipe,
+ unsigned width, unsigned height)
{
unsigned i, size;
size = width * height;
- for (i = 0; i < VL_MAX_PLANES; ++i) {
- buffer->ycbcr[i].num_instances = 0;
+ for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
buffer->ycbcr[i].resource = pipe_buffer_create
(
pipe->screen,
PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STREAM,
- sizeof(struct vl_ycbcr_vertex_stream) * size
+ sizeof(struct vl_ycbcr_block) * size * 4
);
+ if (!buffer->ycbcr[i].resource)
+ goto error_ycbcr;
}
for (i = 0; i < VL_MAX_REF_FRAMES; ++i) {
pipe->screen,
PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STREAM,
- sizeof(struct vl_mv_vertex_stream) * size
+ 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_NUM_COMPONENTS; ++i)
+ pipe_resource_reference(&buffer->mv[i].resource, NULL);
+
+error_ycbcr:
+ for (i = 0; i < VL_NUM_COMPONENTS; ++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
assert(buffer);
- buf.stride = sizeof(struct vl_ycbcr_vertex_stream);
+ buf.stride = sizeof(struct vl_ycbcr_block);
buf.buffer_offset = 0;
buf.buffer = buffer->ycbcr[component].resource;
+ buf.user_buffer = NULL;
return buf;
}
assert(buffer);
- buf.stride = sizeof(struct vl_mv_vertex_stream);
+ buf.stride = sizeof(struct vl_motionvector);
buf.buffer_offset = 0;
buf.buffer = buffer->mv[motionvector].resource;
+ buf.user_buffer = NULL;
return buf;
}
assert(buffer && pipe);
- for (i = 0; i < VL_MAX_PLANES; ++i) {
+ for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
buffer->ycbcr[i].vertex_stream = pipe_buffer_map
(
pipe,
buffer->ycbcr[i].resource,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buffer->ycbcr[i].transfer
);
}
(
pipe,
buffer->mv[i].resource,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buffer->mv[i].transfer
);
}
}
-static void
-get_motion_vectors(enum pipe_mpeg12_motion_type mo_type, struct pipe_motionvector *src, struct vertex4s dst[2])
+struct vl_ycbcr_block *
+vl_vb_get_ycbcr_stream(struct vl_vertex_buffer *buffer, int component)
{
- if (mo_type == PIPE_MPEG12_MOTION_TYPE_FRAME) {
- dst[0].x = dst[1].x = src->top.x;
- dst[0].y = dst[1].y = src->top.y;
- dst[0].z = dst[1].z = 0;
-
- } else {
- dst[0].x = src->top.x;
- dst[0].y = src->top.y;
- dst[0].z = src->top.field_select ? 3 : 1;
-
- dst[1].x = src->bottom.x;
- dst[1].y = src->bottom.y;
- dst[1].z = src->bottom.field_select ? 3 : 1;
- }
+ assert(buffer);
+ assert(component < VL_NUM_COMPONENTS);
- dst[0].w = src->top.wheight;
- dst[1].w = src->bottom.wheight;
+ return buffer->ycbcr[component].vertex_stream;
}
-static bool
-get_ycbcr_vectors(struct vl_ycbcr_vertex_stream *stream,
- struct pipe_mpeg12_macroblock *mb, const unsigned (*empty_block_mask)[2][2])
+unsigned
+vl_vb_get_mv_stream_stride(struct vl_vertex_buffer *buffer)
{
- bool completely_empty = true;
- unsigned i, j;
-
- stream->pos.x = mb->mbx;
- stream->pos.y = mb->mby;
- stream->dct_type_field = mb->dct_type == PIPE_MPEG12_DCT_TYPE_FIELD;
- stream->mb_type_intra = mb->dct_intra;
-
- for ( i = 0; i < 2; ++i)
- for ( j = 0; j < 2; ++j) {
- bool empty = !(mb->cbp & (*empty_block_mask)[i][j]);
- stream->eb[i][j] = empty;
- completely_empty &= empty;
- }
+ assert(buffer);
- return !completely_empty;
+ return buffer->width;
}
-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_motionvector *
+vl_vb_get_mv_stream(struct vl_vertex_buffer *buffer, int ref_frame)
{
- unsigned i, mv_pos;
-
assert(buffer);
- assert(mb);
-
- if(mb->cbp) {
- for (i = 0; i < VL_MAX_PLANES; ++i) {
- assert(buffer->ycbcr[i].num_instances < buffer->width * buffer->height);
- if (get_ycbcr_vectors(buffer->ycbcr[i].vertex_stream, mb, &(*empty_block_mask)[i])) {
- buffer->ycbcr[i].vertex_stream++;
- buffer->ycbcr[i].num_instances++;
- }
- }
- }
+ assert(ref_frame < VL_MAX_REF_FRAMES);
- mv_pos = mb->mbx + mb->mby * buffer->width;
- get_motion_vectors(mb->mo_type, &mb->mv[0], buffer->mv[0].vertex_stream[mv_pos].mv);
- get_motion_vectors(mb->mo_type, &mb->mv[1], buffer->mv[1].vertex_stream[mv_pos].mv);
+ return buffer->mv[ref_frame].vertex_stream;
}
void
assert(buffer && pipe);
- for (i = 0; i < VL_MAX_PLANES; ++i) {
+ for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
pipe_buffer_unmap(pipe, buffer->ycbcr[i].transfer);
}
}
}
-unsigned
-vl_vb_restart(struct vl_vertex_buffer *buffer, int component)
-{
- unsigned num_instances;
-
- assert(buffer);
-
- num_instances = buffer->ycbcr[component].num_instances;
- buffer->ycbcr[component].num_instances = 0;
- return num_instances;
-}
-
void
vl_vb_cleanup(struct vl_vertex_buffer *buffer)
{
assert(buffer);
- for (i = 0; i < VL_MAX_REF_FRAMES; ++i) {
+ for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
pipe_resource_reference(&buffer->ycbcr[i].resource, NULL);
}
projects / mesa.git / blobdiff