Fix bug in the tracing code.

(cherry picked from commit 54b628d)
mbucchia · Nov 3, 2022 · cf5a2c6 · cf5a2c6
1 parent 0c24c3b
commit cf5a2c6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/XR_APILAYER_NOVENDOR_toolkit/d3d11.cpp b/XR_APILAYER_NOVENDOR_toolkit/d3d11.cpp
@@ -2114,9 +2114,11 @@ void main(uint3 id : SV_DispatchThreadID)
                                    TLPArg(Context, "Context"),
                                    TLArg(NumViews, "NumViews"),
                                    TLPArg(pDepthStencilView, "DSV"));
-            for (UINT i = 0; i < NumViews; i++) {
-                TraceLoggingWriteTagged(
-                    local, "ID3D11DeviceContext_OMSetRenderTargets", TLPArg(ppRenderTargetViews[i], "RTV"));
+            if (IsTraceEnabled()) {
+                for (UINT i = 0; i < NumViews; i++) {
+                    TraceLoggingWriteTagged(
+                        local, "ID3D11DeviceContext_OMSetRenderTargets", TLPArg(ppRenderTargetViews[i], "RTV"));
+                }
             }
 
             assert(g_instance);
@@ -2146,10 +2148,12 @@ void main(uint3 id : SV_DispatchThreadID)
                                    TLPArg(Context, "Context"),
                                    TLArg(NumRTVs, "NumRTVs"),
                                    TLPArg(pDepthStencilView, "DSV"));
-            for (UINT i = 0; i < NumRTVs; i++) {
-                TraceLoggingWriteTagged(local,
-                                        "ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews",
-                                        TLPArg(ppRenderTargetViews[i], "RTV"));
+            if (IsTraceEnabled() && NumRTVs != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) {
+                for (UINT i = 0; i < NumRTVs; i++) {
+                    TraceLoggingWriteTagged(local,
+                                            "ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews",
+                                            TLPArg(ppRenderTargetViews[i], "RTV"));
+                }
             }
 
             assert(g_instance);
@@ -2180,7 +2184,7 @@ void main(uint3 id : SV_DispatchThreadID)
                                    TLPArg(Context, "Context"),
                                    TLArg(NumViewports, "NumViewports"));
 
-            if (pViewports) {
+            if (IsTraceEnabled() && pViewports) {
                 for (UINT i = 0; i < NumViewports; i++) {
                     TraceLoggingWriteTagged(local,
                                             "ID3D11DeviceContext_RSSetViewports",

diff --git a/XR_APILAYER_NOVENDOR_toolkit/d3d12.cpp b/XR_APILAYER_NOVENDOR_toolkit/d3d12.cpp
@@ -2453,10 +2453,12 @@ namespace {
                                    TLArg(NumRenderTargetDescriptors, "NumRenderTargetDescriptors"),
                                    TLArg(RTsSingleHandleToDescriptorRange, "RTsSingleHandleToDescriptorRange"),
                                    TLPArg(pDepthStencilDescriptor ? pDepthStencilDescriptor->ptr : 0, "DSV"));
-            for (UINT i = 0; i < NumRenderTargetDescriptors; i++) {
-                TraceLoggingWriteTagged(local,
-                                        "ID3D12GraphicsCommandList_OMSetRenderTargets",
-                                        TLPArg(pRenderTargetDescriptors[i].ptr, "RTV"));
+            if (IsTraceEnabled()) {
+                for (UINT i = 0; i < NumRenderTargetDescriptors; i++) {
+                    TraceLoggingWriteTagged(local,
+                                            "ID3D12GraphicsCommandList_OMSetRenderTargets",
+                                            TLPArg(pRenderTargetDescriptors[i].ptr, "RTV"));
+                }
             }
 
             assert(g_instance);