diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-23 19:36:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:38:24 +0200 |
| commit | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (patch) | |
| tree | 252bfea78ff3ccfabedc3b84c8a7331c74e902cd /xorg-server/hw/xfree86/dri2 | |
| parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
| download | vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.tar.gz vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.tar.bz2 vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.zip | |
libX11 mesa xserver pixman git update 23 May 2014
xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b
libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb
pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82
mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad
Diffstat (limited to 'xorg-server/hw/xfree86/dri2')
| -rw-r--r-- | xorg-server/hw/xfree86/dri2/dri2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c index 76708cabc..6dd77963c 100644 --- a/xorg-server/hw/xfree86/dri2/dri2.c +++ b/xorg-server/hw/xfree86/dri2/dri2.c @@ -156,11 +156,9 @@ GetScreenPrime(ScreenPtr master, int prime_id) ds = DRI2GetScreen(slave); if (ds->prime_id == prime_id) - break; + return slave; } - if (!slave) - return master; - return slave; + return master; } static DRI2ScreenPtr |