xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit ebf549db2d9341d99e0d0847b948dd798d98f7dc
Author: Dor Askayo <dor.askayo at gmail.com>
Date:   Fri Nov 22 17:12:03 2019 +0100

    glamor: make sure the correct FBO is cleared
    
    This also removes an unnecesary call to glDrawBuffer.
    
    Signed-off-by: Dor Askayo <dor.askayo at gmail.com>
    Fixes: 0e9a0c20 - "xwayland: clear pixmaps after creation in rootless
                       mode"
    Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/933
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
index 4b3338b43..e045d247e 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -253,7 +253,8 @@ glamor_pixmap_clear_fbo(glamor_screen_private *glamor_priv, glamor_pixmap_fbo *f
         glClearTexImage(fbo->tex, 0, pixmap_format->format, pixmap_format->type, NULL);
     }
     else {
-        glDrawBuffer(GL_COLOR_ATTACHMENT0); /* assumes fbo->fb was attached as GL_COLOR_ATTACHMENT0 */
+        glamor_set_destination_pixmap_fbo(glamor_priv, fbo, 0, 0, fbo->width, fbo->height);
+
         glClearColor(0.0, 0.0, 0.0, 0.0);
         glClear(GL_COLOR_BUFFER_BIT);
     }