Merge remote-tracking branch 'github/master' into profile-gui

[apitrace] / common / trace_parser_flags.cpp

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index 936a89145c303a6a09d60fc96477485248b96269..dcc846be36735d307f21fe75c8e9e8cd00abc541 100644 (file)
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -56,6 +56,36 @@ defaultCallFlags = 0;
 const Entry<CallFlags>
 callFlagTable[] = {
     { "CGLFlushDrawable",                              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 },
+    { "IDirect3D9::GetDeviceCaps",                     CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "IDirect3D9Ex::CheckDeviceFormat",               CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
+    { "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 },
+    { "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 },
+    { "IDirect3DSwapChain9::Present",                  CALL_FLAG_END_FRAME },
+    { "IDirect3DSwapChain9Ex::Present",                CALL_FLAG_END_FRAME },
     { "eglGetProcAddress",                             CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "eglQueryString",                                CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
     { "eglSwapBuffers",                                CALL_FLAG_SWAPBUFFERS },
@@ -64,6 +94,8 @@ callFlagTable[] = {
     { "glBindFramebufferOES",                          CALL_FLAG_SWAP_RENDERTARGET },
     { "glBlitFramebuffer",                             CALL_FLAG_RENDER },
     { "glBlitFramebufferEXT",                          CALL_FLAG_RENDER },
+    { "glCallList",                                    CALL_FLAG_RENDER },
+    { "glCallLists",                                   CALL_FLAG_RENDER },
     { "glClear",                                       CALL_FLAG_RENDER },
     { "glDrawArrays",                                  CALL_FLAG_RENDER },
     { "glDrawArraysEXT",                               CALL_FLAG_RENDER },