From a4472e90ebc235f70655e504f7a310364adf2074 Mon Sep 17 00:00:00 2001 From: Boyuan Zhang Date: Mon, 7 Jun 2021 20:33:43 -0400 Subject: [PATCH] frontends/omx: use pipe buffer map instead of texture map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: eb74f9776 ("gallium: split transfer_(un)map into buffer_(un)map and texture_(un)map") Signed-off-by: Boyuan Zhang Reviewed-by: Marek Olšák Part-of: --- src/gallium/frontends/omx/bellagio/vid_enc.c | 2 +- src/gallium/frontends/omx/tizonia/h264eoutport.c | 2 +- src/gallium/frontends/omx/vid_enc_common.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/frontends/omx/bellagio/vid_enc.c b/src/gallium/frontends/omx/bellagio/vid_enc.c index 20696540d58f..19e5ab0796ee 100644 --- a/src/gallium/frontends/omx/bellagio/vid_enc.c +++ b/src/gallium/frontends/omx/bellagio/vid_enc.c @@ -737,7 +737,7 @@ static OMX_ERRORTYPE vid_enc_FreeOutBuffer(omx_base_PortType *port, OMX_U32 idx, if (buf->pOutputPortPrivate) { struct output_buf_private *outp = buf->pOutputPortPrivate; if (outp->transfer) - pipe_texture_unmap(priv->t_pipe, outp->transfer); + pipe_buffer_unmap(priv->t_pipe, outp->transfer); pipe_resource_reference(&outp->bitstream, NULL); FREE(outp); buf->pOutputPortPrivate = NULL; diff --git a/src/gallium/frontends/omx/tizonia/h264eoutport.c b/src/gallium/frontends/omx/tizonia/h264eoutport.c index c40be512beb4..88bdace07685 100644 --- a/src/gallium/frontends/omx/tizonia/h264eoutport.c +++ b/src/gallium/frontends/omx/tizonia/h264eoutport.c @@ -84,7 +84,7 @@ static OMX_ERRORTYPE h264e_outport_FreeBuffer(const void * ap_obj, OMX_HANDLETYP if (outp) { if (outp->transfer) - pipe_texture_unmap(priv->t_pipe, outp->transfer); + pipe_buffer_unmap(priv->t_pipe, outp->transfer); pipe_resource_reference(&outp->bitstream, NULL); FREE(outp); buf->pOutputPortPrivate = NULL; diff --git a/src/gallium/frontends/omx/vid_enc_common.c b/src/gallium/frontends/omx/vid_enc_common.c index 6035e99a2c77..ceffb3352a55 100644 --- a/src/gallium/frontends/omx/vid_enc_common.c +++ b/src/gallium/frontends/omx/vid_enc_common.c @@ -147,7 +147,7 @@ void vid_enc_BufferEncoded_common(vid_enc_PrivateType * priv, OMX_BUFFERHEADERTY /* ------------- map result buffer ----------------- */ if (outp->transfer) - pipe_texture_unmap(priv->t_pipe, outp->transfer); + pipe_buffer_unmap(priv->t_pipe, outp->transfer); pipe_resource_reference(&outp->bitstream, task->bitstream); pipe_resource_reference(&task->bitstream, NULL); @@ -156,7 +156,7 @@ void vid_enc_BufferEncoded_common(vid_enc_PrivateType * priv, OMX_BUFFERHEADERTY box.height = outp->bitstream->height0; box.depth = outp->bitstream->depth0; - output->pBuffer = priv->t_pipe->texture_map(priv->t_pipe, outp->bitstream, 0, + output->pBuffer = priv->t_pipe->buffer_map(priv->t_pipe, outp->bitstream, 0, PIPE_MAP_READ_WRITE, &box, &outp->transfer); -- GitLab