.gitlab-ci.yml

@@ -139,3 +139,12 @@ check-merge-request:
     reports:
       junit: results.xml
   allow_failure: true
+
+#
+# Workflow rules needed due to:
+# https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
+#
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'

.mailmap

+Adam Jackson <ajax@redhat.com> <ajax@aspartame.nwnk.net>
+Adam Jackson <ajax@redhat.com> <ajax@benzedrine.nwnk.net>
+Adam Jackson <ajax@redhat.com> <ajax@nwnk.net>
+Adam Jackson <ajax@redhat.com> <ajax@theobromine.nwnk.net>
+
+Adam Tkac <atkac@redhat.com> <vonsch@gmail.com>
+
+Alan Coopersmith <alan.coopersmith@oracle.com> <alan.coopersmith@sun.com>
+Alan Coopersmith <alan.coopersmith@oracle.com> <alanc@alf.(none)>
+
+Alan Hourihane <alanh@vmware.com> <alanh@fairlite.demon.co.uk>
+Alan Hourihane <alanh@vmware.com> <alanh@tungstengraphics.com>
+
+Alex Deucher <alexdeucher@gmail.com> <agd5f@yahoo.com>
+Alex Deucher <alexdeucher@gmail.com> <alex@botch2.(none)>
+Alex Deucher <alexdeucher@gmail.com> <alex@botch2.com>
+Alex Deucher <alexdeucher@gmail.com> <alex@cube.(none)>
+Alex Deucher <alexdeucher@gmail.com> <alex@samba.(none)>
+Alex Deucher <alexdeucher@gmail.com> <alexander.deucher@amd.com>
+
+Alexandr Shadchin <alexandr.shadchin@gmail.com> <Alexandr.Shadchin@gmail.com>
+
+Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> <ander@mandriva.com.br>
+
+Arjan van de Ven <arjan@infradead.org> <arjan@linux.intel.com>
+
+Arkadiusz Miśkiewicz <arekm@maven.pl>
+
+Axel Davy <davyaxel0@gmail.com> <axel.davy@ens.fr>
+
+Bart Trojanowski <bart@jukie.net> <bart@symbio-technologies.com>
+
+Ben Byer <bbyer@apple.com> <bbyer@bbyer.(none)>
+Ben Byer <bbyer@apple.com> <bbyer@bbyer.apple.com>
+Ben Byer <bbyer@apple.com> <bbyer@bbyer.local>
+Ben Byer <bbyer@apple.com> <bbyer@bushing.apple.com>
+Ben Byer <bbyer@apple.com> <bbyer@freedesktop.org>
+Ben Byer <bbyer@apple.com> <bbyer@xyzzy.local>
+
+Ben Gamari <bgamari.foss@gmail.com> <bgamari@gmail.com>
+
+Ben Skeggs <bskeggs@redhat.com> <skeggsb@gmail.com>
+
+Benjamin Close <benjamin.close@clearchain.com> <Benjamin.Close@clearchain.com>
+
+Benjamin Tissoires <benjamin.tissoires@gmail.com> <tissoire@cena.fr>
+
+Brian Paul <brianp@vmware.com> Brian <brian@i915.localnet.net>
+Brian Paul <brianp@vmware.com> Brian <brian@yutani.localnet.net>
+Brian Paul <brianp@vmware.com> <brian.paul@tungstengraphics.com>
+
+Brice Goglin <bgoglin@debian.org> <brice.goglin@ens-lyon.org>
+
+Carl Worth <cworth@cworth.org> <cworth@samich.home.cworth.org>
+Carl Worth <cworth@cworth.org> <root@samich.home.cworth.org>
+
+Chase Douglas <chase.douglas@canonical.com> <chase.douglas@ubuntu.com>
+Chase Douglas <chase.douglas@canonical.com> <chasedouglas@gmail.com>
+
+Christian König <christian.koenig@amd.com> <christian.koenig at amd.com>
+
+Colin Guthrie <gmane@colin.guthr.ie> <cguthrie@mandriva.org>
+
+Colin Harrison <colin@xming.myzen.co.uk> <colin.harrison-at-virgin.net>
+Colin Harrison <colin@xming.myzen.co.uk> <colin.harrison@virgin.net>
+
+Dan Nicholson <dbn.lists@gmail.com> <dan@conor.dwcab.com>
+
+Daniel Drake <drake@endlessm.com> <d.drake@mmm.com>
+Daniel Drake <drake@endlessm.com> <dsd@gentoo.org>
+Daniel Drake <drake@endlessm.com> <dsd@laptop.org>
+
+Daniel Martin <consume.noise@gmail.com> <daniel.martin@secunet.com>
+
+Daniel Stone <daniels@collabora.com> <daniel.stone@nokia.com>
+Daniel Stone <daniels@collabora.com> <daniel@fooishbar.org>
+
+Dave Airlie <airlied@redhat.com> <airlied@clockmaker.usersys.redhat.com>
+Dave Airlie <airlied@redhat.com> <airlied@gmail.com>
+Dave Airlie <airlied@redhat.com> <airlied@linux.ie>
+Dave Airlie <airlied@redhat.com> <airlied@panoply-rh.(none)>
+Dave Airlie <airlied@redhat.com> <airlied@pegasus.(none)>
+
+David Heidelberg <david@ixit.cz> David Heidelberger <david.heidelberger@ixit.cz>
+
+David Miller <davem@davemloft.net>
+
+David Nusinow <dnusinow@debian.org> <david@nee.(none)>
+
+David Reveman <reveman@chromium.org> <c99drn@cs.umu.se>
+David Reveman <reveman@chromium.org> <davidr@novell.com>
+
+Demi Marie Obenour <demiobenour@gmail.com> <demi@invisiblethingslab.com>
+
+Dodji Seketeli <dodji@seketeli.org> <dodji@openedhand.com>
+
+Donnie Berkholz <dberkholz@gentoo.org> <donnie@supernova.(none)>
+Donnie Berkholz <dberkholz@gentoo.org> <spyderous@gentoo.org>
+
+Drew Parsons <dparsons@debian.org> <drew@emerall.com>
+Drew Parsons <dparsons@debian.org> <drew@pug.localdomain>
+
+Eamon Walsh <ewalsh@tycho.nsa.gov> <efw@eamonwalsh.com>
+Eamon Walsh <ewalsh@tycho.nsa.gov> <ewalsh@epoch.ncsc.mil>
+Eamon Walsh <ewalsh@tycho.nsa.gov> <ewalsh@moss-huskies.epoch.ncsc.mil>
+Eamon Walsh <ewalsh@tycho.nsa.gov> <ewalsh@moss-uranus.epoch.ncsc.mil>
+
+Egbert Eich <eich@suse.de> <eich@freedesktop.org>
+Egbert Eich <eich@suse.de> <eich@ovid.suse.de>
+Egbert Eich <eich@suse.de> <eich@pdx.freedesktop.org>
+
+Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>
+
+Emma Anholt <emma@anholt.net> <anholt@FreeBSD.org>
+Emma Anholt <emma@anholt.net> <eric@anholt.net>
+
+Eric Engestrom <eric@igalia.com> <eric@engestrom.ch>
+Eric Engestrom <eric@igalia.com> <eric.engestrom@imgtec.com>
+
+Éric Piel <eric.piel@trempin-utc.net>
+Éric Piel <eric.piel@trempin-utc.net> <E.A.B.Piel@tudelft.nl>
+
+Erik Andrén <erik.andren@gmail.com>
+
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
+Faith Ekstrand <faith.ekstrand@collabora.com> <faith@gfxstrand.net>
+
+Felix Kuehling <felix.kuehling@amd.com> <fxkuehl@gmx.de>
+
+François Tigeot <ftigeot@wolfpond.org>
+
+George Sapountzis <gsapountzis@gmail.com> <gsap7@yahoo.gr>
+
+George Staplin <gstaplin@apple.com> <gps@Georges-Workstation.local>
+George Staplin <gstaplin@apple.com> <georgestaplin@george-staplins-mac-pro.local>
+
+Haihao Xiang <haihao.xiang@intel.com>
+
+Hans de Goede <hdegoede@redhat.com>
+Hans de Goede <hdegoede@redhat.com> <j.w.r.degoede@hhs.nl>
+
+Henry Zhao <henry.zhao@oracle.com> <henryz@localhost.localdomain>
+
+Ian Romanick <ian.d.romanick@intel.com> <idr@localhost.localdomain>
+Ian Romanick <ian.d.romanick@intel.com> <idr@umwelt.(none)>
+Ian Romanick <ian.d.romanick@intel.com> <idr@us.ibm.com>
+
+Jan Beich <jbeich@freebsd.org> <jbeich@FreeBSD.org>
+
+Jay Cotton <jay.cotton@oracle.com> <jay.cotton@sun.com>
+
+Jeffrey Smith <whydoubt@gmail.com>
+Jeffrey Smith <whydoubt@gmail.com> <whydoubt@yahoo.com>
+
+Jeremy C. Reed <reed@glacier.reedmedia.net> <reed@reedmedia.net>
+
+Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@dhcp-38-248.EECS.Berkeley.EDU>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@tifa-2.local>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@tifa.local>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremy@yuffie.local>
+Jeremy Huddleston Sequoia <jeremyhu@apple.com> <jeremyhu@freedesktop.org>
+
+Jeremy Uejio <jeremy.uejio@oracle.com> <jeremy.uejio@sun.com>
+
+Jerome Glisse <jglisse@redhat.com> <glisse@freedesktop.org>
+
+Jesse Adkins <jesserayadkins@gmail.com> <jesse_adkins7@yahoo.com>
+
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@jbarnes-mobile.amr.corp.intel.com>
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@jbarnes-t61.(none)>
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@nietzche.virtuousgeek.org>
+Jesse Barnes <jesse.barnes@intel.com> <jbarnes@virtuousgeek.org>
+
+Joel Bosveld <joel.bosveld@gmail.com> <Joel.Bosveld@gmail.com>
+
+John Tapsell <johnflux@gmail.com> <john.tapsell@john-desktop.(none)>
+
+Jon Turney <jon.turney@dronecode.org.uk>
+
+Julien Isorce <j.isorce@samsung.com> <julien.isorce@gmail.com>
+
+Keith Packard <keithp@keithp.com> <keithp@dulcimer.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@guitar.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@koto.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@mandolin.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@neko.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@ukulele.keithp.com>
+Keith Packard <keithp@keithp.com> <keithp@viola.jf.intel.com>
+
+Kevin E Martin <kem@redhat.com> <kem@freedesktop.org>
+Kevin E Martin <kem@redhat.com> <kem@kem.org>
+
+Kristian Høgsberg <krh@bitplanet.net>
+Kristian Høgsberg <krh@bitplanet.net> <krh@redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@sasori.boston.redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@temari.boston.redhat.com>
+
+Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> <lbsousajr@gmail.com>
+
+Lina Versace <lina@kiwitree.net> <chad.versace@linux.intel.com>
+
+Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>
+
+Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
+Łukasz Spintzyk <lukasz.spintzyk@synaptics.com> <lukasz.spintzyk@gmail.com>
+
+Lyude Paul <lyude@redhat.com>
+Lyude Paul <lyude@redhat.com> <cpaul@redhat.com>
+
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <dev@mblankhorst.nl>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <maarten.lankhorst@canonical.com>
+
+Marc Aurele La France <tsi@ualberta.ca> <tsi@ualberta.edu>
+
+Mario Kleiner <mario.kleiner.de@gmail.com> <mario.kleiner@tuebingen.mpg.de>
+
+Mark Kettenis <kettenis@openbsd.org> <mark.kettenis@xs4all.nl>
+
+Matthew Allum <mallum@openedhand.com> <breakfast@10.am>
+Matthew Allum  <mallum@openedhand.com> <mallum@polystyrene.(none)>
+
+Matthieu Herrb <matthieu@herrb.eu> <matthieu.herrb@laas.fr>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@bluenote.herrb.com>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@blues.laas.fr>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@crux.(none)>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@deville.herrb.com>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@laas.fr>
+Matthieu Herrb <matthieu@herrb.eu> <matthieu@roadrock.(none)>
+
+Max Schwarz <Max@x-quadraht.de> <max.schwarz@online.de>
+
+Maya Rashish <maya@NetBSD.org>
+Maya Rashish <maya@NetBSD.org> <coypu@sdf.org>
+
+Michal Srb <msrb@suse.com> <msrb@novell.com>
+
+Michal Suchanek <hramrach@gmail.com> <hramrach@centrum.cz>
+
+Michał Górny <gentoo@mgorny.alt.pl>
+Michał Górny <gentoo@mgorny.alt.pl> <mgorny@gentoo.org>
+
+Michael Vogt <mvo@ubuntu.com> <michael.vogt@ubuntu.com>
+
+Michel Dänzer <michel@daenzer.net>
+Michel Dänzer <michel@daenzer.net> <daenzer@debian.org>
+Michel Dänzer <michel@daenzer.net> <daenzer@vmware.com>
+Michel Dänzer <michel@daenzer.net> <mdaenzer@redhat.com>
+Michel Dänzer <michel@daenzer.net> <michel.daenzer@amd.com>
+Michel Dänzer <michel@daenzer.net> <michel@tungstengraphics.com>
+
+Michele Baldessari <michele@redhat.com> <michele@acksyn.org>
+
+Neil Roberts <nroberts@igalia.com> <neil@linux.intel.com>
+
+nerdopolis <bluescreen_avenger@verizon.net> nerdopolis <rbos@rbos>
+
+Nicolai Hähnle <nicolai.haehnle@amd.com>
+Nicolai Hähnle <nicolai.haehnle@amd.com> <nhaehnle@gmail.com>
+
+Niveditha Rau <niveditha.rau@oracle.com> <niveditha.rau@sun.com>
+
+Oliver McFadden <oliver.mcfadden@linux.intel.com> <oliver.mcfadden@nokia.com>
+
+Olivier Fourdan <ofourdan@redhat.com> <fourdan@xfce.org>
+
+Owen W. Taylor <otaylor@fishsoup.net>
+Owen W. Taylor <otaylor@fishsoup.net> <otaylor@huygens.home.fishsoup.net>
+Owen W. Taylor <otaylor@fishsoup.net> <otaylor@redhat.com>
+
+Pauli Nieminen <pauli.nieminen@linux.intel.com> <ext-pauli.nieminen@nokia.com>
+
+Paulo Zanoni <paulo.r.zanoni@intel.com> Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
+Paulo Zanoni <paulo.r.zanoni@intel.com> Paulo Ricardo Zanoni <pzanoni@mandriva.com>
+
+Pekka Paalanen <pekka.paalanen@collabora.co.uk> <pekka.paalanen@collabora.com>
+
+Peter Harris <pharris@opentext.com> <peter.harris@hummingbird.com>
+
+Peter Hutterer <peter.hutterer@who-t.net> <peter.hutterer@redhat.com>
+Peter Hutterer <peter.hutterer@who-t.net> <peter@cs.unisa.edu.au>
+Peter Hutterer <peter.hutterer@who-t.net> <whot@potoroo.wearablelab.ml.unisa.edu.au>
+Peter Hutterer <peter.hutterer@who-t.net> rpm-build <rpm-build>
+
+Pierre Willenbrock <pierre@pirsoft.de> <pierre@pirsoft.dnsalias.org>
+
+Qiang Yu <yuq825@gmail.com> <Qiang.Yu@amd.com>
+
+Rami Ylimaki <rami.ylimaki@vincit.fi>
+Rami Ylimaki <rami.ylimaki@vincit.fi> <ext-rami.ylimaki@nokia.com>
+
+Rémi Cardona <remi@gentoo.org>
+Rémi Cardona <remi@gentoo.org> <remi.cardona@lri.fr>
+
+Rob Clark <robclark@freedesktop.org> <robdclark@gmail.com>
+
+Roland Bär <roland@verifysoft.de>
+
+Roland Scheidegger <sroland@vmware.com> <rscheidegger_lists@hispeed.ch>
+Roland Scheidegger <sroland@vmware.com> <sroland@tungstengraphics.com>
+
+Roman Gilg <subdiff@gmail.com>
+Roman Kapl <code@rkapl.cz>
+
+Ross Burton <ross.burton@intel.com> <ross@burtonini.com>
+Ross Burton <ross.burton@intel.com> <ross@linux.intel.com>
+
+Sam Lau <sam.lau@oracle.com> <sam.lau@sun.com>
+
+Simon Farnsworth <simon.farnsworth@onelan.com> <simon.farnsworth@onelan.co.uk>
+
+Sjoerd Simons <sjoerd@collabora.com> <sjoerd.simons@collabora.co.uk>
+
+Søren Sandmann Pedersen <sandmann@redhat.com>
+Søren Sandmann Pedersen <sandmann@redhat.com> <soren.sandmann@gmail.com>
+Søren Sandmann Pedersen <sandmann@redhat.com> <sandmann@daimi.au.dk>
+Søren Sandmann Pedersen <sandmann@redhat.com> <ssp@l3000.localdomain>
+Søren Sandmann Pedersen <sandmann@redhat.com> <ssp@redhat.com>
+Søren Sandmann Pedersen <sandmann@redhat.com> <ssp@dhcp83-218.boston.redhat.com>
+
+Stuart Kreitman <stuart.kreitman@oracle.com> <stuart.kreitman@sun.com>
+
+Thierry Reding <treding@nvidia.com> <thierry.reding@avionic-design.de>
+Thierry Reding <treding@nvidia.com> <thierry.reding@gmail.com>
+
+Thomas Hellstrom <thellstrom@vmware.com> <thomas-at-tungstengraphics-dot-com>
+Thomas Hellstrom <thellstrom@vmware.com> <thomas-at-tungstengraphics.com>
+Thomas Hellstrom <thellstrom@vmware.com> <unichrome@shipmail.org>
+
+Thomas Jaeger <thjaeger@gmail.com> <ThJaeger@gmail.com>
+
+Tiago Vignatti <tiago.vignatti@nokia.com>
+Tiago Vignatti <tiago.vignatti@nokia.com> <tiago.vignatti@Nokia.com>
+Tiago Vignatti <tiago.vignatti@nokia.com> <tiagov@balalaika.(none)>
+Tiago Vignatti <tiago.vignatti@nokia.com> <tv02@c3sl.ufpr.br>
+Tiago Vignatti <tiago.vignatti@nokia.com> <vignatti@c3sl.ufpr.br>
+
+Timo Aaltonen <tjaalton@debian.org> <tjaalton@cc.hut.fi>
+Timo Aaltonen <tjaalton@debian.org> <tjaalton@ubuntu.com>
+
+Tomas Carnecky <tomas.carnecky@gmail.com> <tom@dbservice.com>
+
+Tormod Volden <debian.tormod@gmail.com> <lists.tormod@gmail.com>
+Tormod Volden <debian.tormod@gmail.com> <bugzi06.fdo.tormod@xoxy.net>
+
+Ville Syrjälä <ville.syrjala@linux.intel.com>
+Ville Syrjälä <ville.syrjala@linux.intel.com> <syrjala@sci.fi>
+Ville Syrjälä <ville.syrjala@linux.intel.com> <ville.syrjala@nokia.com>
+
+Yuriy Vasilev <uuvasiliev@yandex.ru>
+
+Zack Rusin <zackr@vmware.com> <zack@kde.org>
+Zack Rusin <zackr@vmware.com> <zack@tungstengraphics.com>
+
+Zephaniah E. Hull <warp@aehallh.com> <warp@agamemnon.b5>
+
+Zhenyu Wang <zhenyuw@linux.intel.com> <zhenyu.z.wang@intel.com>
+
+Zhigang Gong <zhigang.gong@intel.com> <zhigang.gong@gmail.com>
+Zhigang Gong <zhigang.gong@intel.com> <zhigang.gong@linux.intel.com>
+
+Zoltán Böszörményi <zboszor@gmail.com>
+Zoltán Böszörményi <zboszor@gmail.com> <zboszor@pr.hu>

glamor/glamor.c

@@ -271,9 +271,7 @@ void
 glamor_block_handler(ScreenPtr screen)
 {
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-
-    glamor_make_current(glamor_priv);
-    glFlush();
+    glamor_flush(glamor_priv);
 }
 
 static void
@@ -281,8 +279,7 @@ _glamor_block_handler(ScreenPtr screen, void *timeout)
 {
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
 
-    glamor_make_current(glamor_priv);
-    glFlush();
+    glamor_flush(glamor_priv);
 
     screen->BlockHandler = glamor_priv->saved_procs.block_handler;
     screen->BlockHandler(screen, timeout);

glamor/glamor_priv.h

@@ -314,6 +314,7 @@ typedef struct glamor_screen_private {
     Bool suppress_gl_out_of_memory_logging;
     Bool logged_any_fbo_allocation_failure;
     Bool logged_any_pbo_allocation_failure;
+    Bool dirty;
 
     /* xv */
     glamor_program xv_prog;

glamor/glamor_sync.c

@@ -52,8 +52,7 @@ glamor_sync_fence_set_triggered (SyncFence *fence)
 	struct glamor_sync_fence *glamor_fence = glamor_get_sync_fence(fence);
 
 	/* Flush pending rendering operations */
-        glamor_make_current(glamor);
-        glFlush();
+	glamor_flush(glamor);
 
 	fence->funcs.SetTriggered = glamor_fence->set_triggered;
 	fence->funcs.SetTriggered(fence);

glamor/glamor_utils.h

@@ -672,6 +672,17 @@ glamor_make_current(glamor_screen_private *glamor_priv)
         lastGLContext = glamor_priv->ctx.ctx;
         glamor_priv->ctx.make_current(&glamor_priv->ctx);
     }
+    glamor_priv->dirty = TRUE;
+}
+
+static inline void
+glamor_flush(glamor_screen_private *glamor_priv)
+{
+    if (glamor_priv->dirty) {
+        glamor_make_current(glamor_priv);
+        glFlush();
+        glamor_priv->dirty = FALSE;
+    }
 }
 
 static inline BoxRec