diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-09-09 12:51:38 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-09-09 12:51:38 +0800 |
| commit | 8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (patch) | |
| tree | 22f2533527d63df3736c638c4b9c7a8059ecb4ec /indra/llrender/llgl.h | |
| parent | 50fb526c1011d0dd623e312ff70365e32a6d50a7 (diff) | |
| parent | 12743eca6958b897d7eb3f0cf791ad8ada3fc790 (diff) | |
Merge branch 'main' into 2025.06
Diffstat (limited to 'indra/llrender/llgl.h')
| -rw-r--r-- | indra/llrender/llgl.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index bf8368a7b3..130b06f9df 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -154,17 +154,20 @@ void rotate_quat(LLQuaternion& rotation); void flush_glerror(); // Flush GL errors when we know we're handling them correctly. -void log_glerror(); +void log_glerror(std::string comment); void assert_glerror(); void clear_glerror(); -#if !LL_RELEASE_FOR_DOWNLOAD -# define stop_glerror() assert_glerror() -# define llglassertok() assert_glerror() -# define STOP_GLERROR stop_glerror() +//#if !LL_RELEASE_FOR_DOWNLOAD +#if 1 +# define LOG_GLERROR(COMMENT) log_glerror(COMMENT) +# define stop_glerror() log_glerror("stop") +# define llglassertok() log_glerror("ASSERTOK") +# define STOP_GLERROR log_glerror("STOP") #else +# define LOG_GLERROR(COMMENT) # define stop_glerror() # define llglassertok() # define STOP_GLERROR |