From 1c8766bd85fc211c25c415bcddabb949e930ca36 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Tue, 7 Jan 2025 14:02:24 +0000 Subject: [PATCH] Expand out DXIL Debugger RDCASSERT's which were using ^ --- renderdoc/driver/shaders/dxil/dxil_debug.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp index 5bdf61687..3630c0d75 100644 --- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp @@ -3181,7 +3181,10 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper, } uint32_t stride = fmt.stride; - RDCASSERT(!((stride == 1) ^ byteAddress)); + if(byteAddress) + RDCASSERTEQUAL(stride, 1); + else + RDCASSERTNOTEQUAL(stride, 1); RDCASSERTEQUAL(result.columns, 1); RDCASSERTEQUAL(fmt.numComps, result.columns); @@ -4370,7 +4373,10 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper, // Ensure global variables use global memory // Ensure non-global variables do not use global memory - RDCASSERT(!((cast(inst.args[0]) != NULL) ^ alloc.global)); + if(alloc.global) + RDCASSERT(cast(inst.args[0])); + else + RDCASSERT(!cast(inst.args[0])); result.type = baseType; result.rows = (uint8_t)countElems; @@ -5423,7 +5429,11 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper, }; // Update the result variable - RDCASSERT(!(result.name.empty() ^ (resultId == DXILDebug::INVALID_ID))); + if(resultId == DXILDebug::INVALID_ID) + RDCASSERT(result.name.empty()); + else + RDCASSERT(!result.name.empty()); + if(!result.name.empty() && resultId != DXILDebug::INVALID_ID) { if(m_State)