KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/vl: do not call transfer_unmap if transfer is NULL 

CC: mesa-stable
Acked-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6817>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2020-09-22 14:31:32 +02:00 committed by Marge Bot
parent 8d2757789a
commit b121b1b8b8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
View File

@ -769,7 +769,8 @@ vl_mpeg12_end_frame(struct pipe_video_codec *decoder,
vl_vb_unmap(&buf->vertex_stream, dec->context);
dec->context->transfer_unmap(dec->context, buf->tex_transfer);
if (buf->tex_transfer)
dec->context->transfer_unmap(dec->context, buf->tex_transfer);
vb[0] = dec->quads;
vb[1] = dec->pos;

6
src/gallium/auxiliary/vl/vl_vertex_buffers.c
View File

@ -352,11 +352,13 @@ vl_vb_unmap(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
assert(buffer && pipe);
for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
pipe_buffer_unmap(pipe, buffer->ycbcr[i].transfer);
if (buffer->ycbcr[i].transfer)
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);
if (buffer->mv[i].transfer)
pipe_buffer_unmap(pipe, buffer->mv[i].transfer);
}
}