[virglrenderer-devel] [PATCH] Revert "renderer: swizzle sampler border color channel if we emulate alpha format"

[Erik Faye-Lund]

On 03. aug. 2018 18:10, Elie Tournier wrote:
> This reverts commit 6a4ef6d8a284d163236d99f30bc5e1480d009544.
>
> Fix a bunch of dEQP-GLES31.functional.texture.border_clamp.* failures when
> running on GLES
>
> Signed-off-by: Elie Tournier <elie.tournier at collabora.com>
> ---
>   src/vrend_renderer.c | 13 ++-----------
>   1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
> index ddf7f3a..f3051d6 100644
> --- a/src/vrend_renderer.c
> +++ b/src/vrend_renderer.c
> @@ -4866,17 +4866,8 @@ static void vrend_apply_sampler_state(struct vrend_context *ctx,
>         }
>      }
>   
> -   if (memcmp(&tex->state.border_color, &state->border_color, 16) || set_all ||
> -       is_emulated_alpha) {
> -      if (is_emulated_alpha) {
> -         union pipe_color_union border_color;
> -         border_color = state->border_color;
> -         border_color.ui[0] = border_color.ui[3];
> -         border_color.ui[3] = 0;
> -         glTexParameterIuiv(target, GL_TEXTURE_BORDER_COLOR, border_color.ui);
> -      } else
> -         glTexParameterIuiv(target, GL_TEXTURE_BORDER_COLOR, state->border_color.ui);
> -   }
> +   if (memcmp(&tex->state.border_color, &state->border_color, 16) || set_all)
> +      glTexParameterIuiv(target, GL_TEXTURE_BORDER_COLOR, state->border_color.ui);
>      tex->state = *state;
>   }
>   

This seems wrong. If swizzle the texture, we need to swizzle the 
border-color as well...

Have your figured out what's actually going on?