[Mesa-dev] [PATCH 2/3] i965: Allow GL_UNPACK_SKIP_ROWS/PIXELS in intel_try_pbo_upload

[Jason Ekstrand]

Patches 1 and 2 are

Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

On Mon, Dec 22, 2014 at 3:08 PM, Neil Roberts <neil at linux.intel.com> wrote:

> This should just be a simple case of adding the skip values to the src
> offset
> so we can trivially implement it.
> ---
>  src/mesa/drivers/dri/i965/intel_tex_image.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c
> b/src/mesa/drivers/dri/i965/intel_tex_image.c
> index 52ee97e..b1b49b9 100644
> --- a/src/mesa/drivers/dri/i965/intel_tex_image.c
> +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
> @@ -105,7 +105,7 @@ intel_try_pbo_upload(struct gl_context *ctx,
>
>     DBG("trying pbo upload\n");
>
> -   if (ctx->_ImageTransferState || unpack->SkipPixels ||
> unpack->SkipRows) {
> +   if (ctx->_ImageTransferState) {
>        DBG("%s: image transfer\n", __FUNCTION__);
>        return false;
>     }
> @@ -137,6 +137,11 @@ intel_try_pbo_upload(struct gl_context *ctx,
>
>     /* note: potential 64-bit ptr to 32-bit int cast */
>     src_offset = (GLuint) (unsigned long) pixels;
> +   src_offset += _mesa_image_offset(2,
> +                                    unpack,
> +                                    width, height,
> +                                    format, type,
> +                                    0, 0, 0 /* img/row/column */);
>     src_buffer = intel_bufferobj_buffer(brw, pbo,
>                                         src_offset, src_stride * height);
>
> --
> 1.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150107/0964bb3a/attachment.html>