AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SkDEBUGFAILs that are problematic for Chromium

Browse Source 
BUG=368107
R=egdaniel@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/268683003

git-svn-id: http://skia.googlecode.com/svn/trunk@14508 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-01 19:21:41 +00:00
parent a60538e954
commit e83b9b7c20
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gpu/gl/GrGLInterface.cpp
View File

@ -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 {

6
src/gpu/gl/GrGLUtil.cpp
View File

@ -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;
}