diff options
| author | Tim Rowley <[email protected]> | 2016-04-22 19:41:23 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-04-27 10:41:54 -0500 |
| commit | e7201bd31b4c7beb1a2d0c4659477946e263d5cf (patch) | |
| tree | dc9d3704fb85f139918b45f69672f6369a3ff624 /src/gallium/drivers/swr/rasterizer/common | |
| parent | 24f23817d2b15941c84f42c202eba5b24599286b (diff) | |
swr: [rasterizer] warning cleanup
Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/rasterizer/common')
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/common/swr_assert.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/common/swr_assert.h b/src/gallium/drivers/swr/rasterizer/common/swr_assert.h index fecadb3d499..a805acc777c 100644 --- a/src/gallium/drivers/swr/rasterizer/common/swr_assert.h +++ b/src/gallium/drivers/swr/rasterizer/common/swr_assert.h @@ -59,13 +59,6 @@ #else -#if SWR_ENABLE_ASSERTS -#if defined(assert) -#undef assert -#endif -#define assert(exp) SWR_ASSERT(exp) -#endif - bool SwrAssert( bool chkDebugger, bool& enabled, @@ -87,6 +80,12 @@ bool SwrAssert( #if SWR_ENABLE_ASSERTS #define SWR_ASSERT(e, ...) _SWR_ASSERT(true, e, ##__VA_ARGS__) + +#if defined(assert) +#undef assert +#endif +#define assert(exp) SWR_ASSERT(exp) + #endif #if SWR_ENABLE_REL_ASSERTS @@ -97,11 +96,11 @@ bool SwrAssert( #endif // SWR_ENABLE_ASSERTS || SWR_ENABLE_REL_ASSERTS #if !SWR_ENABLE_ASSERTS -#define SWR_ASSERT(e, ...) +#define SWR_ASSERT(e, ...) (void)(0) #endif #if !SWR_ENABLE_REL_ASSERTS -#define SWR_REL_ASSERT(e, ...) +#define SWR_REL_ASSERT(e, ...) (void)(0) #endif #define SWR_NOT_IMPL SWR_ASSERT(0, "%s not implemented", __FUNCTION__) |