[Mesa-dev] [PATCH v3 08/10] i965/pixel_read: Use meta_pbo_GetTexSubImage for PBO ReadPixels

[Neil Roberts]

Jason Ekstrand <jason at jlekstrand.net> writes:

> diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/intel_pixel_read.c
> index 688a919..a64a5f4 100644
> --- a/src/mesa/drivers/dri/i965/intel_pixel_read.c
> +++ b/src/mesa/drivers/dri/i965/intel_pixel_read.c
> @@ -172,15 +58,11 @@ intelReadPixels(struct gl_context * ctx,
>  
>     DBG("%s\n", __FUNCTION__);
>  
> -   if (_mesa_is_bufferobj(pack->BufferObj)) {
> -      /* Using PBOs, so try the BLT based path. */
> -      if (do_blit_readpixels(ctx, x, y, width, height, format, type, pack,
> -                             pixels)) {
> -         return;
> -      }
> -
> +   if (_mesa_meta_pbo_GetTexSubImage(ctx, 2, NULL, x, y, 0, width, height, 1,
> +                                     format, type, pixels, pack))
> +      return;
> +   else
>        perf_debug("%s: fallback to CPU mapping in PBO case\n", __FUNCTION__);
> -   }

I think this perf message will now be hit whenever a PBO isn't used. It
probably needs to be something like ‘else if (_mesa_is_bufferobj)…’