xserver: Branch 'server-1.20-branch'

[GitLab Mirror]

 glamor/glamor.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 22449f6300aad600cc49024640651a46a128e3ad
Author: Jose Maria Casanova Crespo <jmcasanova at igalia.com>
Date:   Tue Jun 8 14:52:17 2021 +0200

    glamor: Avoid using GL_QUADS on V3D
    
    Like in 0e3f1252dacdc3194 ("glamor: Avoid using GL_QUADS on VC4")
    this will avoid mesa to fallback doing conversion for QUADS primitives.
    
    Signed-off-by: Jose Maria Casanova Crespo <jmcasanova at igalia.com>
    Reviewed-by: Emma Anholt <emma at anholt.net>
    (cherry picked from commit 9adb13e296baead53112a268ddfd291195742c71)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index abefef614..4409ca5c4 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -654,7 +654,8 @@ glamor_init(ScreenPtr screen, unsigned int flags)
      * cached IB.
      */
     if (strstr((char *)glGetString(GL_VENDOR), "Broadcom") &&
-        strstr((char *)glGetString(GL_RENDERER), "VC4"))
+        (strstr((char *)glGetString(GL_RENDERER), "VC4") ||
+         strstr((char *)glGetString(GL_RENDERER), "V3D")))
         glamor_priv->use_quads = FALSE;
 
     glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size);