summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-08-03 19:43:28 +0100
committerAdam Jackson <ajax@redhat.com>2017-09-13 14:38:06 -0400
commiteac1a2e37b833c179b587107230805ea1fb3dfda (patch)
tree8b1997ea09cf4db85372e6502a77d9348277ebfc
parent82df2ce38c560915f8c6574052bd56215b649072 (diff)
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@collabora.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--hw/xfree86/dri2/dri2.c11
1 files changed, 5 insertions, 6 deletions
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) {