xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Wed Sep 13 18:38:49 UTC 2017
hw/xfree86/dri2/dri2.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit eac1a2e37b833c179b587107230805ea1fb3dfda
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu Aug 3 19:43:28 2017 +0100
dri2: sort DRI2InfoPtr::version checking in ascending order
Makes it easer to follow if 8 is between 7 and 9 ;-)
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index f9f9859e1..75abc18ac 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -1538,6 +1538,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
ds->CreateBuffer = info->CreateBuffer;
ds->DestroyBuffer = info->DestroyBuffer;
ds->CopyRegion = info->CopyRegion;
+ cur_minor = 1;
if (info->version >= 4) {
ds->ScheduleSwap = info->ScheduleSwap;
@@ -1545,13 +1546,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
ds->GetMSC = info->GetMSC;
cur_minor = 3;
}
- else {
- cur_minor = 1;
- }
- if (info->version >= 8) {
- ds->AuthMagic = info->AuthMagic2;
- }
if (info->version >= 5) {
ds->LegacyAuthMagic = info->AuthMagic;
}
@@ -1566,6 +1561,10 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
cur_minor = 4;
}
+ if (info->version >= 8) {
+ ds->AuthMagic = info->AuthMagic2;
+ }
+
if (info->version >= 9) {
ds->CreateBuffer2 = info->CreateBuffer2;
if (info->CreateBuffer2 && pScreen->isGPU) {
More information about the xorg-commit
mailing list