Simplify R_ASSERT_CURE macros

Xottab-DUTY · Xottab-DUTY · commit e9487a136e70 · 2024-10-18T05:58:32.000+03:00
Always assume that cure can be used

Also, corrected ignoreAlways usage so that it won't interfere with the
cure
diff --git a/src/Layers/xrRender/Texture.cpp b/src/Layers/xrRender/Texture.cpp
@@ -253,7 +253,7 @@ IC u32 it_height_rev_base(u32 d, u32 s)
 ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize)
 {
     ret_msize = 0;
-    R_ASSERT1_CURE(fRName && fRName[0], true, { return nullptr; });
+    R_ASSERT1_CURE(fRName && fRName[0], { return nullptr; });
 
     HRESULT result;
     ID3DTexture2D* pTexture2D = nullptr;
diff --git a/src/Layers/xrRenderDX11/dx11Texture.cpp b/src/Layers/xrRenderDX11/dx11Texture.cpp
@@ -275,7 +275,7 @@ IC u32 it_height_rev_base(u32 d, u32 s) {   return  color_rgba  (
 ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize)
 {
     ret_msize = 0;
-    R_ASSERT1_CURE(fRName && fRName[0], true, { return nullptr; });
+    R_ASSERT1_CURE(fRName && fRName[0], { return nullptr; });
 
     DirectX::TexMetadata IMG;
     DirectX::ScratchImage texture;
@@ -316,7 +316,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize)
 {
     // Load and get header
     S = FS.r_open(fn);
-    R_ASSERT2_CURE(S, fn, true, { return nullptr; });
+    R_ASSERT2_CURE(S, fn, { return nullptr; });
 
     img_size = S->length();
 #ifdef DEBUG
diff --git a/src/Layers/xrRenderGL/glTexture.cpp b/src/Layers/xrRenderGL/glTexture.cpp
@@ -61,7 +61,7 @@ u32 calc_texture_size(int lod, u32 mip_cnt, size_t orig_size)
 GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc)
 {
     ret_msize = 0;
-    R_ASSERT1_CURE(fRName && fRName[0], true, { return 0; });
+    R_ASSERT1_CURE(fRName && fRName[0], { return 0; });
 
     GLuint pTexture = 0;
     string_path fn;
@@ -101,7 +101,7 @@ GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc)
     {
         // Load and get header
         S = FS.r_open(fn);
-        R_ASSERT2_CURE(S, fn, true, { return 0; });
+        R_ASSERT2_CURE(S, fn, { return 0; });
         img_size = S->length();
 #ifdef DEBUG
         Msg("* Loaded: %s[%d]b", fn, img_size);
diff --git a/src/xrCore/Crypto/xr_sha.cpp b/src/xrCore/Crypto/xr_sha.cpp
@@ -15,17 +15,17 @@ static_assert(xr_sha1::DigestSize == SHA_DIGEST_LENGTH);
 xr_sha1::hash_t xr_sha1::calculate_with_yielder(const u8* data, u32 data_size, const yielder_t& yielder)
 {
 #ifdef USE_OPENSSL
-    R_ASSERT1_CURE(data && data_size, true,
+    R_ASSERT1_CURE(data && data_size,
     {
         return {};
     });
 
     EVP_MD_CTX* sha_ctx = EVP_MD_CTX_new();
-    R_ASSERT1_CURE(sha_ctx, true,
+    R_ASSERT1_CURE(sha_ctx,
     {
         return {};
     });
-    R_ASSERT1_CURE(EVP_DigestInit_ex(sha_ctx, EVP_sha1(), nullptr) != 0, true,
+    R_ASSERT1_CURE(EVP_DigestInit_ex(sha_ctx, EVP_sha1(), nullptr) != 0,
     {
         EVP_MD_CTX_free(sha_ctx);
         return {};
diff --git a/src/xrCore/xrDebug_macros.h b/src/xrCore/xrDebug_macros.h
@@ -65,59 +65,51 @@
 #ifdef DEBUG
 #define NODEFAULT FATAL("nodefault reached")
 
-#define R_ASSERT1_CURE(expr, can_be_cured, cure)\
+#define R_ASSERT1_CURE(expr, cure)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr);\
-            if (can_be_cured)\
-            {\
-                cure;\
-            }\
+            static bool ignoreAlways = false;\
+            if (!ignoreAlways)\
+                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr);\
+            cure;\
         }\
     } while (false)
 
-#define R_ASSERT2_CURE(expr, desc, can_be_cured, cure)\
+#define R_ASSERT2_CURE(expr, desc, cure)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc);\
-            if (can_be_cured)\
-            {\
-                cure;\
-            }\
+            static bool ignoreAlways = false;\
+            if (!ignoreAlways)\
+                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc);\
+            cure;\
         }\
     } while (false)
 
-#define R_ASSERT3_CURE(expr, desc, arg1, can_be_cured, cure)\
+#define R_ASSERT3_CURE(expr, desc, arg1, cure)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc, arg1);\
-            if (can_be_cured)\
-            {\
-                cure;\
-            }\
+            static bool ignoreAlways = false;\
+            if (!ignoreAlways)\
+                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc, arg1);\
+            cure;\
         }\
     } while (false)
 
-#define R_ASSERT4_CURE(expr, cure, desc, arg1, arg2, can_be_cured)\
+#define R_ASSERT4_CURE(expr, cure, desc, arg1, arg2)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc, arg1, arg2);\
-            if (can_be_cured)\
-            {\
-                cure;\
-            }\
+            static bool ignoreAlways = false;\
+            if (!ignoreAlways)\
+                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc, arg1, arg2);\
+            cure;\
         }\
     } while (false)
 
@@ -167,63 +159,39 @@
             xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, (long)err);\
     } while (false)
 #else // DEBUG
-#define R_ASSERT1_CURE(expr, can_be_cured, cure)\
+#define R_ASSERT1_CURE(expr, cure)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            if (!can_be_cured)\
-                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr);\
-            else\
-            {\
-                cure;\
-            }\
+            cure;\
         }\
     } while (false)
 
-#define R_ASSERT2_CURE(expr, desc, can_be_cured, cure)\
+#define R_ASSERT2_CURE(expr, desc, cure)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            if (!can_be_cured)\
-                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc);\
-            else\
-            {\
-                cure;\
-            }\
+            cure;\
         }\
     } while (false)
 
-#define R_ASSERT3_CURE(expr, desc, arg1, can_be_cured, cure)\
+#define R_ASSERT3_CURE(expr, desc, arg1, cure)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            if (!can_be_cured)\
-                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc, arg1);\
-            else\
-            {\
-                cure;\
-            }\
+            cure;\
         }\
     } while (false)
 
-#define R_ASSERT4_CURE(expr, cure, desc, arg1, arg2, can_be_cured)\
+#define R_ASSERT4_CURE(expr, cure, desc, arg1, arg2)\
     do\
     {\
-        static bool ignoreAlways = false;\
-        if (!ignoreAlways && !(expr))\
+        if (!(expr))\
         {\
-            if (!can_be_cured)\
-                xrDebug::Fail(ignoreAlways, DEBUG_INFO, #expr, desc, arg1, arg2);\
-            else\
-            {\
-                cure;\
-            }\
+            cure;\
         }\
     } while (false)
 
diff --git a/src/xrSound/SoundRender_Core_StartStop.cpp b/src/xrSound/SoundRender_Core_StartStop.cpp
@@ -7,7 +7,7 @@
 
 void CSoundRender_Core::i_start(CSoundRender_Emitter* E) const
 {
-    R_ASSERT1_CURE(E, true, { return; });
+    R_ASSERT1_CURE(E, { return; });
 
     // Search lowest-priority target
     float Ptarget = flt_max;
diff --git a/src/xrSound/SoundRender_Emitter_StartStop.cpp b/src/xrSound/SoundRender_Emitter_StartStop.cpp
@@ -110,7 +110,7 @@ void CSoundRender_Emitter::cancel()
 void CSoundRender_Emitter::stop_target()
 {
     wait_prefill();
-    R_ASSERT1_CURE(target, true, { return; });
+    R_ASSERT1_CURE(target, { return; });
     target->stop();
     target = nullptr;
 }
diff --git a/src/xrSound/SoundRender_Source.cpp b/src/xrSound/SoundRender_Source.cpp
@@ -169,7 +169,7 @@ bool CSoundRender_Source::LoadWave(pcstr pName)
     const vorbis_info* ovi = ov_info(&ovf, -1);
 
     // verify
-    R_ASSERT3_CURE(ovi, "Invalid source info:", pName, true,
+    R_ASSERT3_CURE(ovi, "Invalid source info:", pName,
     {
         ov_clear(&ovf);
         return false;
@@ -244,7 +244,7 @@ bool CSoundRender_Source::LoadWave(pcstr pName)
 #endif
     }
 
-    R_ASSERT3_CURE(m_info.maxAIDist >= 0.1f && m_info.maxDist >= 0.1f, "Invalid max distance.", pName, true,
+    R_ASSERT3_CURE(m_info.maxAIDist >= 0.1f && m_info.maxDist >= 0.1f, "Invalid max distance.", pName,
     {
         ov_clear(&ovf);
         return false;
diff --git a/src/xrSound/SoundRender_Target.cpp b/src/xrSound/SoundRender_Target.cpp
@@ -6,7 +6,7 @@
 
 void CSoundRender_Target::start(CSoundRender_Emitter* E)
 {
-    R_ASSERT1_CURE(E, true, { return; });
+    R_ASSERT1_CURE(E, { return; });
 
     // *** Initial buffer startup ***
     // 1. Fill parameters
@@ -37,7 +37,7 @@ void CSoundRender_Target::rewind()
 
 void CSoundRender_Target::update()
 {
-    R_ASSERT1_CURE(m_pEmitter, true, { return; });
+    R_ASSERT1_CURE(m_pEmitter, { return; });
 }
 
 void CSoundRender_Target::fill_parameters()
diff --git a/src/xrSound/SoundRender_TargetA.cpp b/src/xrSound/SoundRender_TargetA.cpp
@@ -142,7 +142,7 @@ void CSoundRender_TargetA::update()
 
 void CSoundRender_TargetA::fill_parameters()
 {
-    R_ASSERT1_CURE(m_pEmitter, true, { return; });
+    R_ASSERT1_CURE(m_pEmitter, { return; });
     inherited::fill_parameters();
 
     // 3D params
@@ -177,7 +177,7 @@ void CSoundRender_TargetA::fill_parameters()
 
 void CSoundRender_TargetA::submit_buffer(ALuint BufferID) const
 {
-    R_ASSERT1_CURE(m_pEmitter, true, { return; });
+    R_ASSERT1_CURE(m_pEmitter, { return; });
     const auto [data, dataSize] = m_pEmitter->obtain_block();
     A_CHK(alBufferData(BufferID, dataFormat, data, static_cast<ALsizei>(dataSize), sampleRate));
 }

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ IC u32 it_height_rev_base(u32 d, u32 s)`
`253`	`253`	`ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize)`
`254`	`254`	`{`
`255`	`255`	`ret_msize = 0;`
`256`		`- R_ASSERT1_CURE(fRName && fRName[0], true, { return nullptr; });`
	`256`	`+ R_ASSERT1_CURE(fRName && fRName[0], { return nullptr; });`
`257`	`257`
`258`	`258`	`HRESULT result;`
`259`	`259`	`ID3DTexture2D* pTexture2D = nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,17 @@ static_assert(xr_sha1::DigestSize == SHA_DIGEST_LENGTH);`
`15`	`15`	`xr_sha1::hash_t xr_sha1::calculate_with_yielder(const u8* data, u32 data_size, const yielder_t& yielder)`
`16`	`16`	`{`
`17`	`17`	`#ifdef USE_OPENSSL`
`18`		`- R_ASSERT1_CURE(data && data_size, true,`
	`18`	`+ R_ASSERT1_CURE(data && data_size,`
`19`	`19`	`{`
`20`	`20`	`return {};`
`21`	`21`	`});`
`22`	`22`
`23`	`23`	`EVP_MD_CTX* sha_ctx = EVP_MD_CTX_new();`
`24`		`- R_ASSERT1_CURE(sha_ctx, true,`
	`24`	`+ R_ASSERT1_CURE(sha_ctx,`
`25`	`25`	`{`
`26`	`26`	`return {};`
`27`	`27`	`});`
`28`		`- R_ASSERT1_CURE(EVP_DigestInit_ex(sha_ctx, EVP_sha1(), nullptr) != 0, true,`
	`28`	`+ R_ASSERT1_CURE(EVP_DigestInit_ex(sha_ctx, EVP_sha1(), nullptr) != 0,`
`29`	`29`	`{`
`30`	`30`	`EVP_MD_CTX_free(sha_ctx);`
`31`	`31`	`return {};`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`void CSoundRender_Core::i_start(CSoundRender_Emitter* E) const`
`9`	`9`	`{`
`10`		`- R_ASSERT1_CURE(E, true, { return; });`
	`10`	`+ R_ASSERT1_CURE(E, { return; });`
`11`	`11`
`12`	`12`	`// Search lowest-priority target`
`13`	`13`	`float Ptarget = flt_max;`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void CSoundRender_Emitter::cancel()`
`110`	`110`	`void CSoundRender_Emitter::stop_target()`
`111`	`111`	`{`
`112`	`112`	`wait_prefill();`
`113`		`- R_ASSERT1_CURE(target, true, { return; });`
	`113`	`+ R_ASSERT1_CURE(target, { return; });`
`114`	`114`	`target->stop();`
`115`	`115`	`target = nullptr;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ bool CSoundRender_Source::LoadWave(pcstr pName)`
`169`	`169`	`const vorbis_info* ovi = ov_info(&ovf, -1);`
`170`	`170`
`171`	`171`	`// verify`
`172`		`- R_ASSERT3_CURE(ovi, "Invalid source info:", pName, true,`
	`172`	`+ R_ASSERT3_CURE(ovi, "Invalid source info:", pName,`
`173`	`173`	`{`
`174`	`174`	`ov_clear(&ovf);`
`175`	`175`	`return false;`
`@@ -244,7 +244,7 @@ bool CSoundRender_Source::LoadWave(pcstr pName)`
`244`	`244`	`#endif`
`245`	`245`	`}`
`246`	`246`
`247`		`- R_ASSERT3_CURE(m_info.maxAIDist >= 0.1f && m_info.maxDist >= 0.1f, "Invalid max distance.", pName, true,`
	`247`	`+ R_ASSERT3_CURE(m_info.maxAIDist >= 0.1f && m_info.maxDist >= 0.1f, "Invalid max distance.", pName,`
`248`	`248`	`{`
`249`	`249`	`ov_clear(&ovf);`
`250`	`250`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`void CSoundRender_Target::start(CSoundRender_Emitter* E)`
`8`	`8`	`{`
`9`		`- R_ASSERT1_CURE(E, true, { return; });`
	`9`	`+ R_ASSERT1_CURE(E, { return; });`
`10`	`10`
`11`	`11`	`// * Initial buffer startup *`
`12`	`12`	`// 1. Fill parameters`
`@@ -37,7 +37,7 @@ void CSoundRender_Target::rewind()`
`37`	`37`
`38`	`38`	`void CSoundRender_Target::update()`
`39`	`39`	`{`
`40`		`- R_ASSERT1_CURE(m_pEmitter, true, { return; });`
	`40`	`+ R_ASSERT1_CURE(m_pEmitter, { return; });`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`void CSoundRender_Target::fill_parameters()`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ void CSoundRender_TargetA::update()`
`142`	`142`
`143`	`143`	`void CSoundRender_TargetA::fill_parameters()`
`144`	`144`	`{`
`145`		`- R_ASSERT1_CURE(m_pEmitter, true, { return; });`
	`145`	`+ R_ASSERT1_CURE(m_pEmitter, { return; });`
`146`	`146`	`inherited::fill_parameters();`
`147`	`147`
`148`	`148`	`// 3D params`
`@@ -177,7 +177,7 @@ void CSoundRender_TargetA::fill_parameters()`
`177`	`177`
`178`	`178`	`void CSoundRender_TargetA::submit_buffer(ALuint BufferID) const`
`179`	`179`	`{`
`180`		`- R_ASSERT1_CURE(m_pEmitter, true, { return; });`
	`180`	`+ R_ASSERT1_CURE(m_pEmitter, { return; });`
`181`	`181`	`const auto [data, dataSize] = m_pEmitter->obtain_block();`
`182`	`182`	`A_CHK(alBufferData(BufferID, dataFormat, data, static_cast<ALsizei>(dataSize), sampleRate));`
`183`	`183`	`}`