Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: src/gpu/gl/GrGLUtil.cpp

Issue 1947373003: Fix unit test crash caused by OSMesa not supporting rendering to GL_ALPHA8 (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLUtil.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLUtil.cpp
diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp
index a8c5425c6490916914fbd13286f85cf8bcd10079..46b58f1d768bf3f1aaeb3f95f51a0e27c48f8b35 100644
--- a/src/gpu/gl/GrGLUtil.cpp
+++ b/src/gpu/gl/GrGLUtil.cpp
@@ -127,7 +127,6 @@ void GrGLGetDriverInfo(GrGLStandard standard,
}
return;
}
-
int n = sscanf(versionString, "%d.%d Mesa %d.%d",
&major, &minor, &driverMajor, &driverMinor);
if (4 == n) {
@@ -304,6 +303,9 @@ GrGLRenderer GrGLGetRendererFromString(const char* rendererString) {
}
}
}
+ if (strcmp("Mesa Offscreen", rendererString)) {
+ return kOSMesa_GrGLRenderer;
+ }
}
return kOther_GrGLRenderer;
}
« no previous file with comments | « src/gpu/gl/GrGLUtil.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698