X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fvl%2Fvl_vertex_buffers.c;h=45a9badce21b8a4cc48a57cba3b37d3a4dbe73fd;hb=f06194b012c0c2b40d514cf6e31d7e60055e27af;hp=4e0d704a23d39330179ccaa0d01767d0ff90c18b;hpb=bfb4fb057d92869f98dc627d53d3e1b7d031d93f;p=mesa.git diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.c b/src/gallium/auxiliary/vl/vl_vertex_buffers.c index 4e0d704a23d..45a9badce21 100644 --- a/src/gallium/auxiliary/vl/vl_vertex_buffers.c +++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.c @@ -18,7 +18,7 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -26,128 +26,352 @@ **************************************************************************/ #include -#include -#include -#include -#include -#include +#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, struct pipe_vertex_element* element) +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); - assert(element); - - /* setup rectangle element */ - element->src_offset = 0; - element->instance_divisor = 0; - element->vertex_buffer_index = 0; - element->src_format = PIPE_FORMAT_R32G32_FLOAT; /* create buffer */ quad.stride = sizeof(struct vertex2f); - quad.max_index = 4 * max_blocks - 1; quad.buffer_offset = 0; - quad.buffer = pipe_buffer_create + quad.buffer.resource = pipe_buffer_create ( pipe->screen, PIPE_BIND_VERTEX_BUFFER, - sizeof(struct vertex2f) * 4 * max_blocks + PIPE_USAGE_DEFAULT, + sizeof(struct vertex2f) * 4 ); + quad.is_user_buffer = false; - if(!quad.buffer) + if(!quad.buffer.resource) return quad; /* and fill it */ v = pipe_buffer_map ( pipe, - quad.buffer, - PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD, + quad.buffer.resource, + PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE, &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, quad.buffer, buf_transfer); + pipe_buffer_unmap(pipe, buf_transfer); return quad; } struct pipe_vertex_buffer -vl_vb_create_buffer(struct pipe_context *pipe, unsigned max_blocks, - struct pipe_vertex_element *elements, unsigned num_elements, - unsigned vertex_buffer_index) +vl_vb_upload_pos(struct pipe_context *pipe, unsigned width, unsigned height) { - struct pipe_vertex_buffer buf; - unsigned i, size = 0; + struct pipe_vertex_buffer pos; + struct pipe_transfer *buf_transfer; + struct vertex2s *v; - for ( i = 0; i < num_elements; ++i ) { - elements[i].src_offset = size; - elements[i].instance_divisor = 0; - elements[i].vertex_buffer_index = vertex_buffer_index; - size += util_format_get_blocksize(elements[i].src_format); - } + unsigned x, y; - buf.stride = size; - buf.max_index = 4 * max_blocks - 1; - buf.buffer_offset = 0; - buf.buffer = pipe_buffer_create + assert(pipe); + + /* create buffer */ + pos.stride = sizeof(struct vertex2s); + pos.buffer_offset = 0; + pos.buffer.resource = pipe_buffer_create ( pipe->screen, PIPE_BIND_VERTEX_BUFFER, - size * 4 * max_blocks + PIPE_USAGE_DEFAULT, + sizeof(struct vertex2s) * width * height ); + pos.is_user_buffer = false; - return buf; + if(!pos.buffer.resource) + return pos; + + /* and fill it */ + v = pipe_buffer_map + ( + pipe, + pos.buffer.resource, + PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE, + &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; +} + +static struct pipe_vertex_element +vl_vb_get_quad_vertex_element(void) +{ + struct pipe_vertex_element element; + + /* setup rectangle element */ + element.src_offset = 0; + element.instance_divisor = 0; + element.vertex_buffer_index = 0; + 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 i, offset = 0; + + assert(elements && num_elements); + + for ( i = 0; i < num_elements; ++i ) { + 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_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; + + /* block num element */ + vertex_elems[VS_I_BLOCK_NUM].src_format = PIPE_FORMAT_R32_FLOAT; + + vl_vb_element_helper(&vertex_elems[VS_I_VPOS], 2, 1); + + return pipe->create_vertex_elements_state(pipe, 3, vertex_elems); +} + +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, unsigned max_blocks, unsigned num_elements) +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_NUM_COMPONENTS; ++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; + } + + 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 +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.resource = buffer->ycbcr[component].resource; + buf.is_user_buffer = false; + + return buf; +} + +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.resource = buffer->mv[motionvector].resource; + buf.is_user_buffer = false; + + return buf; +} + +void +vl_vb_map(struct vl_vertex_buffer *buffer, struct pipe_context *pipe) +{ + unsigned i; + + assert(buffer && pipe); + + 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_RANGE, + &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_RANGE, + &buffer->mv[i].transfer + ); + } + +} + +struct vl_ycbcr_block * +vl_vb_get_ycbcr_stream(struct vl_vertex_buffer *buffer, int component) { assert(buffer); + assert(component < VL_NUM_COMPONENTS); - buffer->num_verts = 0; - buffer->num_elements = num_elements; - buffer->buffer = MALLOC(max_blocks * num_elements * sizeof(float) * 4); - return buffer->buffer != NULL; + return buffer->ycbcr[component].vertex_stream; } unsigned -vl_vb_upload(struct vl_vertex_buffer *buffer, void *dst) +vl_vb_get_mv_stream_stride(struct vl_vertex_buffer *buffer) { - unsigned todo; + 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); + + return buffer->mv[ref_frame].vertex_stream; +} + +void +vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe) +{ + unsigned i; - todo = buffer->num_verts; - buffer->num_verts = 0; + assert(buffer && pipe); - if(todo) - memcpy(dst, buffer->buffer, sizeof(float) * buffer->num_elements * todo); + for (i = 0; i < VL_NUM_COMPONENTS; ++i) { + pipe_buffer_unmap(pipe, buffer->ycbcr[i].transfer); + } - return todo; + 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); - FREE(buffer->buffer); + for (i = 0; i < VL_NUM_COMPONENTS; ++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); + } }