diff options
-rw-r--r-- | src/gpu/gl/GrGLInterface.cpp | 12 | ||||
-rw-r--r-- | src/gpu/gl/GrGLUtil.cpp | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index 5bf0efb767..056a601874 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -116,9 +116,15 @@ GrGLInterface* GrGLInterface::NewClone(const GrGLInterface* interface) { return clone; } -#define RETURN_FALSE_INTERFACE \ - SkDEBUGFAIL("GrGLInterface::validate() failed."); \ - return false; \ +#ifdef SK_DEBUG + static int kIsDebug = 1; +#else + static int kIsDebug = 0; +#endif + +#define RETURN_FALSE_INTERFACE \ + if (kIsDebug) { SkDebugf("%s:%d GrGLInterface::validate() failed.\n", __FILE__, __LINE__); } \ + return false; bool GrGLInterface::validate() const { diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp index ddfcfbf0a6..0fa2d2ce18 100644 --- a/src/gpu/gl/GrGLUtil.cpp +++ b/src/gpu/gl/GrGLUtil.cpp @@ -99,7 +99,7 @@ bool get_gl_version_for_mesa(int mesaMajorVersion, int* major, int* minor) { GrGLStandard GrGLGetStandardInUseFromString(const char* versionString) { if (NULL == versionString) { - SkDEBUGFAIL("NULL GL version string."); + SkDebugf("NULL GL version string."); return kNone_GrGLStandard; } @@ -139,7 +139,7 @@ bool GrGLIsChromiumFromRendererString(const char* rendererString) { GrGLVersion GrGLGetVersionFromString(const char* versionString) { if (NULL == versionString) { - SkDEBUGFAIL("NULL GL version string."); + SkDebugf("NULL GL version string."); return GR_GL_INVALID_VER; } @@ -178,7 +178,7 @@ GrGLVersion GrGLGetVersionFromString(const char* versionString) { GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) { if (NULL == versionString) { - SkDEBUGFAIL("NULL GLSL version string."); + SkDebugf("NULL GLSL version string."); return GR_GLSL_INVALID_VER; } |