Mesa (master): swr: [rasterizer common] make disabled asserts always print (but not break)

[Tim Rowley]

Module: Mesa
Branch: master
Commit: 8d3b20135ea3b6bad6eebdb043119b66d8d63712
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d3b20135ea3b6bad6eebdb043119b66d8d63712

Author: Tim Rowley <timothy.o.rowley at intel.com>
Date:   Mon Aug  1 18:10:18 2016 -0600

swr: [rasterizer common] make disabled asserts always print (but not break)

Signed-off-by: Tim Rowley <timothy.o.rowley at intel.com>

---

 src/gallium/drivers/swr/rasterizer/common/swr_assert.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/common/swr_assert.cpp b/src/gallium/drivers/swr/rasterizer/common/swr_assert.cpp
index 49587d0..7250101 100644
--- a/src/gallium/drivers/swr/rasterizer/common/swr_assert.cpp
+++ b/src/gallium/drivers/swr/rasterizer/common/swr_assert.cpp
@@ -121,8 +121,6 @@ bool SwrAssert(
     const char* pFmtString /* = nullptr */,
     ...)
 {
-    if (!enabled) return false;
-
     SetTextColor(stderr, TEXT_CYAN, TEXT_NORMAL);
 
     fprintf(stderr, "%s(%d): ", pFileName, lineNum);
@@ -182,7 +180,7 @@ bool SwrAssert(
         OutputDebugStringA("\n");
     }
 
-    if (KNOB_ENABLE_ASSERT_DIALOGS)
+    if (enabled && KNOB_ENABLE_ASSERT_DIALOGS)
     {
         int retval = sprintf_s(
             &msgBuf[offset],
@@ -228,11 +226,11 @@ bool SwrAssert(
     }
     else
     {
-        return IsDebuggerPresent() || !chkDebugger;
+        return (IsDebuggerPresent() || !chkDebugger) && enabled;
     }
 #endif // _WIN32
 
-    return true;
+    return enabled;
 }
 
 #endif // SWR_ENABLE_ASSERTS