Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / mesa / SkMesaGLContext.cpp

diff --git a/src/third_party/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp b/src/third_party/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
index 0199d12..58e325d 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
+++ b/src/third_party/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
@@ -53,7 +53,11 @@ void SkMesaGLContext::destroyGLContext() {
 
 static const GrGLint gBOGUS_SIZE = 16;
 
-const GrGLInterface* SkMesaGLContext::createGLContext() {
+const GrGLInterface* SkMesaGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
+    if (kGLES_GrGLStandard == forcedGpuAPI) {
+        return NULL;
+    }
+
     /* Create an RGBA-mode context */
 #if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
     /* specify Z, stencil, accum sizes */