[Mesa-dev] [PATCH 3/4] i965/tex_image: Reference the renderbuffer miptree in setTexBuffer2

[Pohjolainen, Topi]

On Tue, Sep 12, 2017 at 04:23:04PM -0700, Jason Ekstrand wrote:
> The old code made a new miptree that referenced the same BO as the
> renderbuffer and just trusted in the memory aliasing to work.  There are
> only two ways in which the new miptree is liable to differ from the one
> in the renderbuffer and neither of them matter:
> 
>  1) It may have a different target.  The only targets that we can ever
>     see in intelSetTexBuffer2 are GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE
>     and the difference between the two doesn't matter as far as the
>     miptree is concerned; genX(update_sampler_state) only looks at the
>     gl_texture_object and not the miptree when determining whether or
>     not to use normalized coordinates.
> 
>  2) It may have a very slightly different format.  Again, this doesn't
>     matter because we've supported texture views for quite some time so
>     we always look at the gl_texture_object format instead of the
>     miptree format for hardware setup anyway.
> 
> On the other hand, because we were recreating the miptree, we were using
> intel_miptree_create_for_bo which doesn't understand modifiers.  We
> really want this function to work without doing a resolve so long as you
> have modifiers so we need to fix that.

I read the last sentence a few times but it still sounds a little odd. Maybe
split it in two?

I read the whole series and it looks sensible to me. However, I think I
understand even less glx and compositors than you. Therefore for the series
weak:

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

> ---
>  src/mesa/drivers/dri/i965/intel_tex_image.c | 23 ++++-------------------
>  1 file changed, 4 insertions(+), 19 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
> index 4661581..09ff287 100644
> --- a/src/mesa/drivers/dri/i965/intel_tex_image.c
> +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
> @@ -223,8 +223,6 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
>     struct intel_renderbuffer *rb;
>     struct gl_texture_object *texObj;
>     struct gl_texture_image *texImage;
> -   mesa_format texFormat = MESA_FORMAT_NONE;
> -   struct intel_mipmap_tree *mt;
>     GLenum internal_format = 0;
>  
>     texObj = _mesa_get_current_tex_object(ctx, target);
> @@ -244,33 +242,20 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
>        return;
>  
>     if (rb->mt->cpp == 4) {
> -      if (texture_format == __DRI_TEXTURE_FORMAT_RGB) {
> +      if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
>           internal_format = GL_RGB;
> -         texFormat = MESA_FORMAT_B8G8R8X8_UNORM;
> -      }
> -      else {
> +      else
>           internal_format = GL_RGBA;
> -         texFormat = MESA_FORMAT_B8G8R8A8_UNORM;
> -      }
>     } else if (rb->mt->cpp == 2) {
> +      /* This is 565 */
>        internal_format = GL_RGB;
> -      texFormat = MESA_FORMAT_B5G6R5_UNORM;
>     }
>  
>     intel_miptree_make_shareable(brw, rb->mt);
> -   mt = intel_miptree_create_for_bo(brw, rb->mt->bo, texFormat, 0,
> -                                    rb->Base.Base.Width,
> -                                    rb->Base.Base.Height,
> -                                    1, rb->mt->surf.row_pitch,
> -                                    MIPTREE_CREATE_DEFAULT);
> -   if (mt == NULL)
> -       return;
> -   mt->target = target;
>  
>     _mesa_lock_texture(&brw->ctx, texObj);
>     texImage = _mesa_get_tex_image(ctx, texObj, target, 0);
> -   intel_set_texture_image_mt(brw, texImage, internal_format, mt);
> -   intel_miptree_release(&mt);
> +   intel_set_texture_image_mt(brw, texImage, internal_format, rb->mt);
>     _mesa_unlock_texture(&brw->ctx, texObj);
>  }
>  
> -- 
> 2.5.0.400.gff86faf
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev