Merge branch 'master' into trim-auto

[apitrace] / common / trace_parser_flags.cpp

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index 5347090652dc1e4c2998ad0171c2b618a99eed9e..1ff2b0b76677b68c5c035a62b88d1d005daf3405 100644 (file)
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -57,16 +57,21 @@ 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 },
     { "ID3D11DeviceContext::Draw",                          CALL_FLAG_RENDER },
     { "ID3D11DeviceContext::DrawAuto",                      CALL_FLAG_RENDER },
     { "ID3D11DeviceContext::DrawIndexed",                   CALL_FLAG_RENDER },
@@ -74,6 +79,10 @@ callFlagTable[] = {
     { "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_END_FRAME },
+    { "IDXGISwapChainDWM::Present",                    CALL_FLAG_END_FRAME },
     { "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 },