From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Tue, 2 Aug 2016 00:10:18 +0000 (-0600)
Subject: swr: [rasterizer common] make disabled asserts always print (but not break)
X-Git-Tag: upstream/17.1.0~7453
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d3b20135ea3b6bad6eebdb043119b66d8d63712;p=platform%2Fupstream%2Fmesa.git

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

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

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