X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Ftrace_parser_flags.cpp;h=df989741f1ce34344bc9bf36470ec1eaad61e462;hb=983f27081e422f517cc6712165d2b3a7bf596cb1;hp=8d2c955ff7bb646a842055d9dc3b457b10b8cb9b;hpb=8b929c4f119594ae2880696eab1387ab96c9eee8;p=apitrace

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index 8d2c955..df98974 100644
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -56,32 +56,75 @@ defaultCallFlags = 0;
 const Entry<CallFlags>
 callFlagTable[] = {
     { "CGLFlushDrawable",                              CALL_FLAG_END_FRAME },
+    { "CGLGetCurrentContext",                          CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "ID3D10Device1::CheckMultisampleQualityLevels",  CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "ID3D10Device1::Draw",                           CALL_FLAG_RENDER },
+    { "ID3D10Device1::DrawAuto",                       CALL_FLAG_RENDER },
+    { "ID3D10Device1::DrawIndexed",                    CALL_FLAG_RENDER },
+    { "ID3D10Device1::DrawIndexedInstanced",           CALL_FLAG_RENDER },
+    { "ID3D10Device1::DrawInstanced",                  CALL_FLAG_RENDER },
+    { "ID3D10Device1::OMSetRenderTargets",             CALL_FLAG_SWAP_RENDERTARGET },
+    { "ID3D10Device::CheckMultisampleQualityLevels",   CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "ID3D10Device::Draw",                            CALL_FLAG_RENDER },
+    { "ID3D10Device::DrawAuto",                        CALL_FLAG_RENDER },
+    { "ID3D10Device::DrawIndexed",                     CALL_FLAG_RENDER },
+    { "ID3D10Device::DrawIndexedInstanced",            CALL_FLAG_RENDER },
+    { "ID3D10Device::DrawInstanced",                   CALL_FLAG_RENDER },
+    { "ID3D10Device::OMSetRenderTargets",              CALL_FLAG_SWAP_RENDERTARGET },
+    { "ID3D11Device::CheckMultisampleQualityLevels",   CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "ID3D11DeviceContext1::Draw",                          CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::DrawAuto",                      CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::DrawIndexed",                   CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::DrawIndexedInstanced",          CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::DrawIndexedInstancedIndirect",  CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::DrawInstanced",                 CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::DrawInstancedIndirect",         CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext1::OMSetRenderTargets",       CALL_FLAG_SWAP_RENDERTARGET },
+    { "ID3D11DeviceContext1::OMSetRenderTargetsAndUnorderedAccessViews", CALL_FLAG_SWAP_RENDERTARGET },
+    { "ID3D11DeviceContext::Draw",                          CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::DrawAuto",                      CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::DrawIndexed",                   CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::DrawIndexedInstanced",          CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::DrawIndexedInstancedIndirect",  CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::DrawInstanced",                 CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::DrawInstancedIndirect",         CALL_FLAG_RENDER },
+    { "ID3D11DeviceContext::OMSetRenderTargets",       CALL_FLAG_SWAP_RENDERTARGET },
+    { "ID3D11DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews", CALL_FLAG_SWAP_RENDERTARGET },
+    { "IDXGISwapChain::Present",                       CALL_FLAG_SWAPBUFFERS },
+    { "IDXGISwapChainDWM::Present",                    CALL_FLAG_SWAPBUFFERS },
     { "IDirect3D9::CheckDeviceFormat",                 CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
-    { "IDirect3D9::DrawIndexedPrimitive",              CALL_FLAG_RENDER },
-    { "IDirect3D9::DrawIndexedPrimitiveUP",            CALL_FLAG_RENDER },
-    { "IDirect3D9::DrawPrimitive",                     CALL_FLAG_RENDER },
-    { "IDirect3D9::DrawPrimitiveUP",                   CALL_FLAG_RENDER },
-    { "IDirect3D9::DrawRectPatch",                     CALL_FLAG_RENDER },
-    { "IDirect3D9::DrawTriPatch",                      CALL_FLAG_RENDER },
     { "IDirect3D9::EnumAdapterModes",                  CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9::GetAdapterModeCount",               CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9::GetDeviceCaps",                     CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9Ex::CheckDeviceFormat",               CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
-    { "IDirect3D9Ex::DrawIndexedPrimitive",            CALL_FLAG_RENDER },
-    { "IDirect3D9Ex::DrawIndexedPrimitiveUP",          CALL_FLAG_RENDER },
-    { "IDirect3D9Ex::DrawPrimitive",                   CALL_FLAG_RENDER },
-    { "IDirect3D9Ex::DrawPrimitiveUP",                 CALL_FLAG_RENDER },
-    { "IDirect3D9Ex::DrawRectPatch",                   CALL_FLAG_RENDER },
-    { "IDirect3D9Ex::DrawTriPatch",                    CALL_FLAG_RENDER },
     { "IDirect3D9Ex::EnumAdapterModes",                CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9Ex::GetAdapterModeCount",             CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9Ex::GetDeviceCaps",                   CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "IDirect3DDevice9::Clear",                       CALL_FLAG_RENDER },
+    { "IDirect3DDevice9::DrawIndexedPrimitive",        CALL_FLAG_RENDER },
+    { "IDirect3DDevice9::DrawIndexedPrimitiveUP",      CALL_FLAG_RENDER },
+    { "IDirect3DDevice9::DrawPrimitive",               CALL_FLAG_RENDER },
+    { "IDirect3DDevice9::DrawPrimitiveUP",             CALL_FLAG_RENDER },
+    { "IDirect3DDevice9::DrawRectPatch",               CALL_FLAG_RENDER },
+    { "IDirect3DDevice9::DrawTriPatch",                CALL_FLAG_RENDER },
     { "IDirect3DDevice9::GetDeviceCaps",               CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3DDevice9::GetRenderTargetData",         CALL_FLAG_END_FRAME },
-    { "IDirect3DDevice9::Present",                     CALL_FLAG_END_FRAME },
+    { "IDirect3DDevice9::Present",                     CALL_FLAG_SWAPBUFFERS },
+    { "IDirect3DDevice9::SetRenderTarget",             CALL_FLAG_SWAP_RENDERTARGET },
+    { "IDirect3DDevice9Ex::Clear",                     CALL_FLAG_RENDER },
+    { "IDirect3DDevice9Ex::DrawIndexedPrimitive",      CALL_FLAG_RENDER },
+    { "IDirect3DDevice9Ex::DrawIndexedPrimitiveUP",    CALL_FLAG_RENDER },
+    { "IDirect3DDevice9Ex::DrawPrimitive",             CALL_FLAG_RENDER },
+    { "IDirect3DDevice9Ex::DrawPrimitiveUP",           CALL_FLAG_RENDER },
+    { "IDirect3DDevice9Ex::DrawRectPatch",             CALL_FLAG_RENDER },
+    { "IDirect3DDevice9Ex::DrawTriPatch",              CALL_FLAG_RENDER },
     { "IDirect3DDevice9Ex::GetDeviceCaps",             CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3DDevice9Ex::GetRenderTargetData",       CALL_FLAG_END_FRAME },
-    { "IDirect3DDevice9Ex::Present",                   CALL_FLAG_END_FRAME },
+    { "IDirect3DDevice9Ex::Present",                   CALL_FLAG_SWAPBUFFERS },
+    { "IDirect3DDevice9Ex::PresentEx",                 CALL_FLAG_SWAPBUFFERS },
+    { "IDirect3DDevice9Ex::SetRenderTarget",           CALL_FLAG_SWAP_RENDERTARGET },
+    { "IDirect3DSwapChain9::Present",                  CALL_FLAG_SWAPBUFFERS },
+    { "IDirect3DSwapChain9Ex::Present",                CALL_FLAG_SWAPBUFFERS },
     { "eglGetProcAddress",                             CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "eglQueryString",                                CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "eglSwapBuffers",                                CALL_FLAG_SWAPBUFFERS },
@@ -166,6 +209,8 @@ callFlagTable[] = {
     { "glXGetCurrentContext",                          CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "glXGetCurrentDisplay",                          CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "glXGetCurrentDrawable",                         CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "glXGetFBConfigAttrib",                          CALL_FLAG_VERBOSE },
+    { "glXGetFBConfigAttribSGIX",                      CALL_FLAG_VERBOSE },
     { "glXGetProcAddress",                             CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "glXGetProcAddressARB",                          CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "glXIsDirect",                                   CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },