diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-21 15:41:51 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-21 15:41:51 +0800 |
| commit | 0cdb7d97f67b3a67097e56e71021cb6120ec8a8b (patch) | |
| tree | ef3b4a08dd82d137ebe269bdbaedc89b6576511d /indra/llrender/llgl.h | |
| parent | d13a43c74f9c7e450f87edab0bcd9db39ee7c56e (diff) | |
| parent | c83e19c467ad055ecaf29989ff80051d32f61c98 (diff) | |
Merge branch 'main' into 2025.03
Diffstat (limited to 'indra/llrender/llgl.h')
| -rw-r--r-- | indra/llrender/llgl.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 24ba4d6deb..bf8368a7b3 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -160,18 +160,17 @@ void assert_glerror(); void clear_glerror(); +#if !LL_RELEASE_FOR_DOWNLOAD # define stop_glerror() assert_glerror() # define llglassertok() assert_glerror() - -// stop_glerror is still needed on OS X but has performance implications -// use macro below to conditionally add stop_glerror to non-release builds -// on OS X -#if LL_DARWIN && !LL_RELEASE_FOR_DOWNLOAD -#define STOP_GLERROR stop_glerror() +# define STOP_GLERROR stop_glerror() #else -#define STOP_GLERROR +# define stop_glerror() +# define llglassertok() +# define STOP_GLERROR #endif + #define llglassertok_always() assert_glerror() //////////////////////// |