Bug 1394265 - Don't allow GL version <200. - r=daoshengmu draft
authorJeff Gilbert <jgilbert@mozilla.com>
Thu, 31 Aug 2017 12:50:18 -0700
changeset 656870 d9701c0467ae8bdaa4025dfef2ca24f826c0a900
parent 656783 4984da22242841a5d84c4e5fd866e93a450d9723
child 729271 3082a6e330a2ec0b8684a08aabfd0f21e7f3e549
push id77354
push userbmo:jgilbert@mozilla.com
push dateThu, 31 Aug 2017 19:50:48 +0000
reviewersdaoshengmu
bugs1394265
milestone57.0a1
Bug 1394265 - Don't allow GL version <200. - r=daoshengmu MozReview-Commit-ID: 8wD8uHFc5kY
gfx/gl/GLContext.cpp
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -548,21 +548,18 @@ GLContext::InitWithPrefixImpl(const char
     uint32_t majorVer, minorVer;
     if (!ParseVersion(versionStr, &majorVer, &minorVer)) {
         MOZ_ASSERT(false, "Failed to parse GL_VERSION");
         return false;
     }
     MOZ_ASSERT(majorVer < 10);
     MOZ_ASSERT(minorVer < 10);
     mVersion = majorVer*100 + minorVer*10;
-    if (mVersion < 200) {
-        // Mac OSX 10.6/10.7 machines with Intel GPUs claim only OpenGL 1.4 but
-        // have all the GL2+ extensions that we need.
-        mVersion = 200;
-    }
+    if (mVersion < 200)
+        return false;
 
     ////
 
     const auto glslVersionStr = (const char*)fGetString(LOCAL_GL_SHADING_LANGUAGE_VERSION);
     if (!glslVersionStr) {
         // This happens on the Android emulators. We'll just return 100
         mShadingLanguageVersion = 100;
     } else if (ParseVersion(glslVersionStr, &majorVer, &minorVer)) {