Index: src/gpu/gl/GrGLContext.cpp |
diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/gl/GrGLContext.cpp |
index 54deb323c0a60ff6a40dc7407a5bda900f2e5220..5bc5b6f0312bd65b1e7fd6cf251f167595492c1e 100644 |
--- a/src/gpu/gl/GrGLContext.cpp |
+++ b/src/gpu/gl/GrGLContext.cpp |
@@ -37,8 +37,13 @@ bool GrGLContextInfo::initialize(const GrGLInterface* interface) { |
if (interface->validate()) { |
fGLVersion = GrGLGetVersionFromString(ver); |
+ if (GR_GL_INVALID_VER == fGLVersion) { |
+ return false; |
+ } |
- fGLSLGeneration = GrGetGLSLGeneration(interface); |
+ if (!GrGetGLSLGeneration(interface, &fGLSLGeneration)) { |
+ return false; |
+ } |
fVendor = GrGLGetVendor(interface); |
@@ -51,9 +56,7 @@ bool GrGLContextInfo::initialize(const GrGLInterface* interface) { |
// This must occur before caps init. |
fInterface.reset(SkRef(interface)); |
- fGLCaps->init(*this, interface); |
- |
- return true; |
+ return fGLCaps->init(*this, interface); |
} |
} |
return false; |