[PATCH xserver] glamor: Fall back to software for CopyPlane if we need to

[Michel Dänzer]

On 28/09/16 06:15 AM, Adam Jackson wrote:
> glUniform4ui is available starting in GL{,ES} 3.0. Technically it's
> also in EXT_gpu_shader4, but that's not worth supporting. There was also
> a MESA_shading_language_130 spec proposed at one point; if that ever
> gets finished, we can update epoxy to know about it and fix up the
> feature check.
> 
> Signed-off-by: Adam Jackson <ajax at redhat.com>

[...]

> diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
> index 5b5f0e6..8a329d2 100644
> --- a/glamor/glamor_copy.c
> +++ b/glamor/glamor_copy.c
> @@ -351,6 +351,9 @@ glamor_copy_fbo_fbo_draw(DrawablePtr src,
>      if (!glamor_set_alu(screen, gc ? gc->alu : GXcopy))
>          goto bail_ctx;
>  
> +    if (bitplane && !glamor_priv->can_copyplane)
> +        goto bail_ctx;
> +
>      if (bitplane) {
>          prog = &glamor_priv->copy_plane_prog;
>          copy_facet = &glamor_facet_copyplane;

I'd add the if (!glamor_priv->can_copyplane) inside the existing if
(bitplane). Either way though,

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer