Back out bug 807096 for causing bug 891568. a=backout
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 16 Jul 2013 09:20:35 -0400
changeset 147906 2c68df0e3a54db2dd5bf11293467da450a66ba23
parent 147905 69bdfec92dba490b79339b34ff9eacbb26544807
child 147907 853f08e10baf35164e3d860f31997cb4e451e8f8
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs807096, 891568
milestone24.0a2
Back out bug 807096 for causing bug 891568. a=backout
gfx/gl/GLContext.cpp
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -593,34 +593,21 @@ GLContext::InitWithPrefix(const char *pr
 
         raw_fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
         raw_fGetIntegerv(LOCAL_GL_MAX_CUBE_MAP_TEXTURE_SIZE, &mMaxCubeMapTextureSize);
         raw_fGetIntegerv(LOCAL_GL_MAX_RENDERBUFFER_SIZE, &mMaxRenderbufferSize);
 
 #ifdef XP_MACOSX
         if (mWorkAroundDriverBugs) {
             if (mVendor == VendorIntel) {
-                SInt32 major, minor;
-                OSErr err1 = ::Gestalt(gestaltSystemVersionMajor, &major);
-                OSErr err2 = ::Gestalt(gestaltSystemVersionMinor, &minor);
-
-                // For 2D textures, see bug 737182 for the original restriction to 4K and
-                // see bug 807096 for why we further restricted it to 2K on < 10.8
-                // For good measure, we align renderbuffers on what we do for 2D textures
-                if (err1 != noErr || err2 != noErr ||
-                    major < 10 || (major == 10 && minor < 8)) {
-                    mMaxTextureSize        = std::min(mMaxTextureSize, 2048);
-                    mMaxRenderbufferSize   = std::min(mMaxRenderbufferSize, 2048);
-                }
-                else {
-                    mMaxTextureSize        = std::min(mMaxTextureSize, 4096);
-                    mMaxRenderbufferSize   = std::min(mMaxRenderbufferSize, 4096);
-                }
-                // For cube map textures, see bug 684882.
+                // see bug 737182 for 2D textures, bug 684882 for cube map textures.
+                mMaxTextureSize        = std::min(mMaxTextureSize,        4096);
                 mMaxCubeMapTextureSize = std::min(mMaxCubeMapTextureSize, 512);
+                // for good measure, we align renderbuffers on what we do for 2D textures
+                mMaxRenderbufferSize   = std::min(mMaxRenderbufferSize,   4096);
                 mNeedsTextureSizeChecks = true;
             } else if (mVendor == VendorNVIDIA) {
                 SInt32 major, minor;
                 OSErr err1 = ::Gestalt(gestaltSystemVersionMajor, &major);
                 OSErr err2 = ::Gestalt(gestaltSystemVersionMinor, &minor);
 
                 if (err1 != noErr || err2 != noErr ||
                     major < 10 || (major == 10 && minor < 8)) {