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

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index 1ff2b0b..df98974 100644
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -72,6 +72,15 @@ callFlagTable[] = {
     { "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 },
@@ -81,8 +90,8 @@ callFlagTable[] = {
     { "ID3D11DeviceContext::DrawInstancedIndirect",         CALL_FLAG_RENDER },
     { "ID3D11DeviceContext::OMSetRenderTargets",       CALL_FLAG_SWAP_RENDERTARGET },
     { "ID3D11DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews", CALL_FLAG_SWAP_RENDERTARGET },
-    { "IDXGISwapChain::Present",                       CALL_FLAG_END_FRAME },
-    { "IDXGISwapChainDWM::Present",                    CALL_FLAG_END_FRAME },
+    { "IDXGISwapChain::Present",                       CALL_FLAG_SWAPBUFFERS },
+    { "IDXGISwapChainDWM::Present",                    CALL_FLAG_SWAPBUFFERS },
     { "IDirect3D9::CheckDeviceFormat",                 CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9::EnumAdapterModes",                  CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "IDirect3D9::GetAdapterModeCount",               CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
@@ -100,7 +109,7 @@ callFlagTable[] = {
     { "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 },
@@ -111,10 +120,11 @@ callFlagTable[] = {
     { "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_END_FRAME },
-    { "IDirect3DSwapChain9Ex::Present",                CALL_FLAG_END_FRAME },
+    { "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 },