X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Ftrace_parser_flags.cpp;h=06fdc94278e8c65089f0abd162b5caff817f353c;hb=62e2252a0bf71d12c36d3506aafe824643a05766;hp=cf379cc16af97f7c9d44c78349fe9548a1673702;hpb=896811606399ebc083ff6304b7f629a93830ba0d;p=apitrace

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index cf379cc..06fdc94 100644
--- 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 },
@@ -322,9 +320,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 +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 | */ 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 },