Fix sorting of callFlagTable

Commit 89681160639 inserted three entries in an unsorted position in
the list, tripping up an internal check and causing many apitrace
operations to abort. Fix this by restoring correct sorting.

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index cf379cc16af97f7c9d44c78349fe9548a1673702..f574be96081601209d11b24f4ab4ce0b0d23257e 100644 (file)
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -322,9 +322,6 @@ callFlagTable[] = {
     { "glGetObjectParameterivAPPLE",                   CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetObjectParameterivARB",                     CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetObjectPtrLabel",                           CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glPopDebugGroup",                               CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glPushDebugGroup",                              CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glStringMarkerGREMEDY",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetOcclusionQueryivNV",                       CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetOcclusionQueryuivNV",                      CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetPerfMonitorCounterDataAMD",                CALL_FLAG_NO_SIDE_EFFECTS },
@@ -524,6 +521,9 @@ callFlagTable[] = {
     { "glMultiModeDrawElementsIBM",                    CALL_FLAG_RENDER },
     { "glObjectLabel",                                 CALL_FLAG_NO_SIDE_EFFECTS },
     { "glObjectPtrLabel",                              CALL_FLAG_NO_SIDE_EFFECTS },
+    { "glPopDebugGroup",                               CALL_FLAG_NO_SIDE_EFFECTS },
+    { "glPushDebugGroup",                              CALL_FLAG_NO_SIDE_EFFECTS },
+    { "glStringMarkerGREMEDY",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glXGetClientString",                            CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "glXGetCurrentContext",                          CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "glXGetCurrentDisplay",                          CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },