commit 3c93076e8c4e1f1bc8f57d0c3bb853d4f4328cda
author Hans de Goede <hdegoede@redhat.com> Mon Feb 06 12:13:17 2017 +0100
committer Emil Velikov <emil.l.velikov@gmail.com> Thu Feb 23 19:34:59 2017 +0000
tree c880c7ad620704d11cdd1ec750df1dc213a8e256
parent 3b524138e6bad217fcf508340a86b65c874c9a9f

glx/glvnd: Fix GLXdispatchIndex sorting

Commit 8bca8d89ef3b ("glx/glvnd: Fix dispatch function names and indices")
fixed the sorting of the array initializers in g_glxglvnddispatchfuncs.c
because FindGLXFunction's binary search needs these to be sorted
alphabetically.

That commit also mostly fixed the sorting of the DI_foo defines in
g_glxglvnddispatchindices.h, which is what actually matters as the
arrays are initialized using "[DI_foo] = glXfoo," but a small error
crept in which at least causes glXGetVisualFromFBConfigSGIX to not
resolve, breaking games such as "The Binding of Isaac: Rebirth" and
"Crypt of the NecroDancer" from Steam not working and possible causes
other problems too.

This commit fixes the last of the sorting errors, fixing these mentioned
games not working.

Fixes: 8bca8d89ef3b ("glx/glvnd: Fix dispatch function names and indices")
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit 4c66f529a8ea4cc7589c1e3760894793c666e9b2)

src/glx/g_glxglvnddispatchindices.h

diff --git a/src/glx/g_glxglvnddispatchindices.h b/src/glx/g_glxglvnddispatchindices.h
index 0891654..05a2c8c 100644
--- a/src/glx/g_glxglvnddispatchindices.h
+++ b/src/glx/g_glxglvnddispatchindices.h
@@ -46,14 +46,14 @@
     DI_GetMscRateOML,
     // GetProcAddress implemented by libglvnd
     // GetProcAddressARB implemented by libglvnd
+    DI_GetScreenDriver,
     // GetSelectedEvent implemented by libglvnd
     DI_GetSelectedEventSGIX,
+    DI_GetSwapIntervalMESA,
+    DI_GetSyncValuesOML,
     DI_GetVideoSyncSGI,
     // GetVisualFromFBConfig implemented by libglvnd
     DI_GetVisualFromFBConfigSGIX,
-    DI_GetScreenDriver,
-    DI_GetSwapIntervalMESA,
-    DI_GetSyncValuesOML,
     // ImportContextEXT implemented by libglvnd
     // IsDirect implemented by libglvnd
     DI_JoinSwapGroupSGIX,
@@ -81,9 +81,9 @@
     DI_SwapIntervalMESA,
     DI_SwapIntervalSGI,
     // UseXFont implemented by libglvnd
-    // WaitGL implemented by libglvnd
     DI_WaitForMscOML,
     DI_WaitForSbcOML,
+    // WaitGL implemented by libglvnd
     DI_WaitVideoSyncSGI,
     // WaitX implemented by libglvnd
     DI_LAST_INDEX