From 25c477158923371b7ca790fc5963a4e5581daecb Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 11 Jul 2014 22:13:33 +0100 Subject: [PATCH] Add drawcall flags for clearcolour/cleardepth --- renderdoc/driver/d3d11/d3d11_context_wrap.cpp | 4 ++-- renderdoc/replay/replay_enums.h | 24 ++++++++++--------- renderdocui/Interop/Enums.cs | 2 ++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp index 7c5ba8b76..3afc4b390 100644 --- a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp @@ -5187,7 +5187,7 @@ bool WrappedID3D11DeviceContext::Serialise_ClearRenderTargetView(ID3D11RenderTar FetchDrawcall draw; draw.name = widen(name); - draw.flags |= eDraw_Clear; + draw.flags |= eDraw_Clear|eDraw_ClearColour; draw.debugMessages = debugMessages; @@ -5541,7 +5541,7 @@ bool WrappedID3D11DeviceContext::Serialise_ClearDepthStencilView(ID3D11DepthSten FetchDrawcall draw; draw.name = widen(name); - draw.flags |= eDraw_Clear; + draw.flags |= eDraw_Clear|eDraw_ClearDepth; draw.debugMessages = debugMessages; diff --git a/renderdoc/replay/replay_enums.h b/renderdoc/replay/replay_enums.h index 582c4dc73..6d7e7ec10 100644 --- a/renderdoc/replay/replay_enums.h +++ b/renderdoc/replay/replay_enums.h @@ -293,19 +293,21 @@ enum ResourceUsage enum DrawcallFlags { // types - eDraw_Clear = 0x01, - eDraw_Drawcall = 0x02, - eDraw_Dispatch = 0x04, - eDraw_CmdList = 0x08, - eDraw_SetMarker = 0x10, - eDraw_PushMarker = 0x20, - eDraw_Present = 0x40, + eDraw_Clear = 0x01, + eDraw_Drawcall = 0x02, + eDraw_Dispatch = 0x04, + eDraw_CmdList = 0x08, + eDraw_SetMarker = 0x10, + eDraw_PushMarker = 0x20, + eDraw_Present = 0x40, // flags - eDraw_UseIBuffer = 0x100, - eDraw_Instanced = 0x200, - eDraw_Auto = 0x400, - eDraw_Indirect = 0x800, + eDraw_UseIBuffer = 0x0100, + eDraw_Instanced = 0x0200, + eDraw_Auto = 0x0400, + eDraw_Indirect = 0x0800, + eDraw_ClearColour = 0x1000, + eDraw_ClearDepth = 0x2000, }; enum SolidShadeMode diff --git a/renderdocui/Interop/Enums.cs b/renderdocui/Interop/Enums.cs index 9ad026dd0..4aeb9fa58 100644 --- a/renderdocui/Interop/Enums.cs +++ b/renderdocui/Interop/Enums.cs @@ -311,6 +311,8 @@ namespace renderdoc Instanced = 0x200, Auto = 0x400, Indirect = 0x800, + ClearColour = 0x1000, + ClearDepth = 0x2000, }; public enum SolidShadeMode