From d4cbd1272b723ba0da03a9664ee85452f8f2d457 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Wed, 13 Jul 2011 23:33:20 +0200 Subject: [PATCH] [g3dvl] don't upload all quant buffer layers at once There seems to be a bug in r600g when uploading more than one layer of a 3D resource at once with a hardware blit. So just do them one at a time to workaround this. --- src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 6 +++-- src/gallium/auxiliary/vl/vl_zscan.c | 25 +++++++------------- src/gallium/auxiliary/vl/vl_zscan.h | 4 +--- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 98b0adabb2b..5b214b83cf5 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -330,8 +330,10 @@ vl_mpeg12_buffer_set_quant_matrix(struct pipe_video_decode_buffer *buffer, struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer; unsigned i; - for (i = 0; i < VL_MAX_PLANES; ++i) - vl_zscan_upload_quant(&buf->zscan[i], intra_matrix, non_intra_matrix); + for (i = 0; i < VL_MAX_PLANES; ++i) { + vl_zscan_upload_quant(&buf->zscan[i], intra_matrix, true); + vl_zscan_upload_quant(&buf->zscan[i], non_intra_matrix, false); + } } static struct pipe_ycbcr_block * diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c index 58cee0070d8..a26d8398f92 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.c +++ b/src/gallium/auxiliary/vl/vl_zscan.c @@ -525,26 +525,23 @@ vl_zscan_set_layout(struct vl_zscan_buffer *buffer, struct pipe_sampler_view *la } void -vl_zscan_upload_quant(struct vl_zscan_buffer *buffer, - const uint8_t intra_matrix[64], - const uint8_t non_intra_matrix[64]) +vl_zscan_upload_quant(struct vl_zscan_buffer *buffer, const uint8_t matrix[64], bool intra) { struct pipe_context *pipe; struct pipe_transfer *buf_transfer; unsigned x, y, i, pitch; - uint8_t *intra, *non_intra; + uint8_t *data; struct pipe_box rect = { - 0, 0, 0, + 0, 0, intra ? 1 : 0, BLOCK_WIDTH, BLOCK_HEIGHT, - 2 + 1 }; assert(buffer); - assert(intra_matrix); - assert(non_intra_matrix); + assert(matrix); pipe = buffer->zscan->pipe; @@ -561,18 +558,14 @@ vl_zscan_upload_quant(struct vl_zscan_buffer *buffer, pitch = buf_transfer->stride; - non_intra = pipe->transfer_map(pipe, buf_transfer); - if (!non_intra) + data = pipe->transfer_map(pipe, buf_transfer); + if (!data) goto error_map; - intra = non_intra + BLOCK_HEIGHT * pitch; - for (i = 0; i < buffer->zscan->blocks_per_line; ++i) for (y = 0; y < BLOCK_HEIGHT; ++y) - for (x = 0; x < BLOCK_WIDTH; ++x) { - intra[i * BLOCK_WIDTH + y * pitch + x] = intra_matrix[x + y * BLOCK_WIDTH]; - non_intra[i * BLOCK_WIDTH + y * pitch + x] = non_intra_matrix[x + y * BLOCK_WIDTH]; - } + for (x = 0; x < BLOCK_WIDTH; ++x) + data[i * BLOCK_WIDTH + y * pitch + x] = matrix[x + y * BLOCK_WIDTH]; pipe->transfer_unmap(pipe, buf_transfer); diff --git a/src/gallium/auxiliary/vl/vl_zscan.h b/src/gallium/auxiliary/vl/vl_zscan.h index be12b8e873a..dd8a943bfb2 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.h +++ b/src/gallium/auxiliary/vl/vl_zscan.h @@ -93,9 +93,7 @@ void vl_zscan_set_layout(struct vl_zscan_buffer *buffer, struct pipe_sampler_view *layout); void -vl_zscan_upload_quant(struct vl_zscan_buffer *buffer, - const uint8_t intra_matrix[64], - const uint8_t non_intra_matrix[64]); +vl_zscan_upload_quant(struct vl_zscan_buffer *buffer, const uint8_t matrix[64], bool intra); void vl_zscan_render(struct vl_zscan_buffer *buffer, unsigned num_instances); -- 2.30.2