gui: Group on glPush/PopGroupMarkerEXT too.

[apitrace] / common / trace_parser_flags.cpp

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index f574be96081601209d11b24f4ab4ce0b0d23257e..06fdc94278e8c65089f0abd162b5caff817f353c 100644 (file)
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -79,6 +79,7 @@ callFlagTable[] = {
     { "ID3D11DeviceContext1::DrawIndexedInstancedIndirect",  CALL_FLAG_RENDER },
     { "ID3D11DeviceContext1::DrawInstanced",                 CALL_FLAG_RENDER },
     { "ID3D11DeviceContext1::DrawInstancedIndirect",         CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::ExecuteCommandList",            CALL_FLAG_RENDER },
     { "ID3D11DeviceContext1::OMSetRenderTargets",       CALL_FLAG_SWAP_RENDERTARGET },
     { "ID3D11DeviceContext1::OMSetRenderTargetsAndUnorderedAccessViews", CALL_FLAG_SWAP_RENDERTARGET },
     { "ID3D11DeviceContext::Draw",                          CALL_FLAG_RENDER },
@@ -88,6 +89,7 @@ callFlagTable[] = {
     { "ID3D11DeviceContext::DrawIndexedInstancedIndirect",  CALL_FLAG_RENDER },
     { "ID3D11DeviceContext::DrawInstanced",                 CALL_FLAG_RENDER },
     { "ID3D11DeviceContext::DrawInstancedIndirect",         CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::ExecuteCommandList",            CALL_FLAG_RENDER },
     { "ID3D11DeviceContext::OMSetRenderTargets",       CALL_FLAG_SWAP_RENDERTARGET },
     { "ID3D11DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews", CALL_FLAG_SWAP_RENDERTARGET },
     { "IDXGISwapChain::Present",                       CALL_FLAG_SWAPBUFFERS },
@@ -212,9 +214,6 @@ callFlagTable[] = {
     { "glGetCombinerOutputParameterfvNV",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetCombinerOutputParameterivNV",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetCombinerStageParameterfvNV",               CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetCompressedMultiTexImageEXT",               CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetCompressedTexImageARB",                    CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetCompressedTextureImageEXT",                CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetConvolutionFilterEXT",                     CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetConvolutionParameterfv",                   CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetConvolutionParameterfvEXT",                CALL_FLAG_NO_SIDE_EFFECTS },
@@ -291,7 +290,6 @@ callFlagTable[] = {
     { "glGetMultiTexGendvEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexGenfvEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexGenivEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetMultiTexImageEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexLevelParameterfvEXT",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexLevelParameterivEXT",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexParameterIivEXT",                  CALL_FLAG_NO_SIDE_EFFECTS },
@@ -521,9 +519,11 @@ 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 },
+    { "glPopDebugGroup",                               /* CALL_FLAG_NO_SIDE_EFFECTS | */ CALL_FLAG_MARKER | CALL_FLAG_MARKER_POP},
+    { "glPopGroupMarkerEXT",                           /* CALL_FLAG_NO_SIDE_EFFECTS | */ CALL_FLAG_MARKER | CALL_FLAG_MARKER_POP},
+    { "glPushDebugGroup",                              /* CALL_FLAG_NO_SIDE_EFFECTS | */ CALL_FLAG_MARKER | CALL_FLAG_MARKER_PUSH },
+    { "glPushGroupMarkerEXT",                          /* CALL_FLAG_NO_SIDE_EFFECTS | */ CALL_FLAG_MARKER | CALL_FLAG_MARKER_PUSH },
+    { "glStringMarkerGREMEDY",                         /* CALL_FLAG_NO_SIDE_EFFECTS | */ CALL_FLAG_MARKER },
     { "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 },