From 656e70fcb18b2579e98ec3f4e6a55a89a9772b74 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 12 Apr 2013 14:23:00 -0700 Subject: [PATCH] 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. --- common/trace_parser_flags.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp index cf379cc..f574be9 100644 --- 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 }, -- 2.43.0