From 64b2fcbb1cc26d76d02a8178d59fbeabe1ed4be0 Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Sun, 12 Apr 2015 22:48:16 +0200 Subject: [PATCH] Disable glCheck by default, move to validate:OpenGlChecks config --- core/nullDC.cpp | 2 ++ core/rend/gles/gles.h | 2 +- core/types.h | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/nullDC.cpp b/core/nullDC.cpp index 20c61857a..0cd29315b 100755 --- a/core/nullDC.cpp +++ b/core/nullDC.cpp @@ -253,6 +253,8 @@ void LoadSettings() settings.debug.SerialConsole = cfgLoadInt("config", "Debug.SerialConsoleEnabled", 0) != 0; settings.reios.ElfFile = cfgLoadStr("reios", "ElfFile",""); + + settings.validate.OpenGlChecks = cfgLoadInt("validate", "OpenGlChecks", 0) != 0; #endif settings.bios.UseReios = cfgLoadInt("config", "bios.UseReios", 0); diff --git a/core/rend/gles/gles.h b/core/rend/gles/gles.h index cee0bfe4f..91fab04fb 100755 --- a/core/rend/gles/gles.h +++ b/core/rend/gles/gles.h @@ -26,7 +26,7 @@ #endif -#define glCheck() verify(glGetError()==GL_NO_ERROR) +#define glCheck() do { if (settings.validate.OpenGlChecks) { verify(glGetError()==GL_NO_ERROR); } } while(0) #define eglCheck() false #define VERTEX_POS_ARRAY 0 diff --git a/core/types.h b/core/types.h index e86513aa4..4d3636488 100644 --- a/core/types.h +++ b/core/types.h @@ -684,6 +684,10 @@ struct settings_t struct { bool SerialConsole; } debug; + + struct { + bool OpenGlChecks; + } validate; }; extern settings_t settings;