Backed out changeset 46d18be48bc4 (bug 981856) for b2g gl bustages
authorWes Kocher <wkocher@mozilla.com>
Fri, 14 Mar 2014 17:33:54 -0700
changeset 190918 5e86e89e463f3ba23c72a16ea99b57ab273fa6b9
parent 190917 355266055005c093a8fdb53955408a69ad1221c1
child 190919 c8e80efab6fb0e88c4b607b548fc970498920426
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs981856
milestone30.0a1
backs out46d18be48bc4210e60eb4f64224768650cb66382
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 46d18be48bc4 (bug 981856) for b2g gl bustages * * * Backed out changeset a2ec4ab256e8 (bug 981856)
content/canvas/test/webgl/non-conf-tests/test_no_arr_points.html
content/canvas/test/webgl/non-conf-tests/test_webgl_available.html
content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html
gfx/gl/GLContextProviderEGL.cpp
--- a/content/canvas/test/webgl/non-conf-tests/test_no_arr_points.html
+++ b/content/canvas/test/webgl/non-conf-tests/test_no_arr_points.html
@@ -113,18 +113,17 @@ void main(void) {
     gl.drawArrays(gl.POINTS, hugeFirst, 1);
     ok(!isScreenBlack(), '[' + info + '] drawArrays[huge first] should color pixels.');
 
     checkGLError(ok, info);
 
     var elemTestFunc = todo; // We fail on most implementations.
     var checkGLTestFunc = todo;
     if (DriverInfo.getDriver() == DriverInfo.DRIVER.ANGLE ||
-        DriverInfo.getOS() == DriverInfo.OS.ANDROID ||
-        DriverInfo.getOS() == DriverInfo.OS.B2G)
+        DriverInfo.getOS() == DriverInfo.OS.ANDROID)
     {
       // ANGLE and Android slaves seem to work fine.
       elemTestFunc = ok;
       checkGLTestFunc = ok;
     }
     if (DriverInfo.getDriver() == DriverInfo.DRIVER.ANDROID_X86_EMULATOR)
     {
       // ...but the Android 4.2 x86 emulator environment is different
--- a/content/canvas/test/webgl/non-conf-tests/test_webgl_available.html
+++ b/content/canvas/test/webgl/non-conf-tests/test_webgl_available.html
@@ -22,16 +22,22 @@ function test() {
       DriverInfo.getOSVersion() < 15)
   {
     // Consider 'random'. Actually, ARMv6 fails, and ARMv7 succeeds, but we have
     // not been successful at determining this from JS. (see bug 917478)
     shouldSucceed = false;
     shouldFail = false;
   }
 
+  if (DriverInfo.getOS() == DriverInfo.OS.B2G) {
+    // We don't run these mochitests on hardware with WebGL-capable hardware yet.
+    shouldSucceed = false;
+    shouldFail = true;
+  }
+
   var gl = WebGLUtil.getWebGL('c');
   if (shouldSucceed) {
     ok(gl, 'Expected WebGL creation to succeed.');
   }
   if (shouldFail) {
     ok(!gl, 'Expected WebGL creation to fail.');
   }
 
--- a/content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html
+++ b/content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html
@@ -6,16 +6,19 @@
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
 <body>
 <canvas id="c1"></canvas>
 <canvas id="c2"></canvas>
 <script>
 
 var testFunc = ok;
+if (DriverInfo.getOS() == DriverInfo.OS.B2G) {
+  testFunc = todo;
+}
 
 function testContextRetrieval(canvasId, creationId, shouldSucceed) {
   var canvas = document.getElementById(canvasId);
   ok(canvas, 'Invalid `canvasId`: ' + canvasId);
 
   var createdGL = canvas.getContext(creationId);
   if (shouldSucceed) {
     testFunc(createdGL, 'Request for \'' + creationId + '\' should succeed.');
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -545,21 +545,16 @@ TRY_AGAIN_POWER_OF_TWO:
     }
 
     return surface;
 }
 
 static const EGLint kEGLConfigAttribsOffscreenPBuffer[] = {
     LOCAL_EGL_SURFACE_TYPE,    LOCAL_EGL_PBUFFER_BIT,
     LOCAL_EGL_RENDERABLE_TYPE, LOCAL_EGL_OPENGL_ES2_BIT,
-    // Old versions of llvmpipe seem to need this to properly create the pbuffer (bug 981856)
-    LOCAL_EGL_RED_SIZE,        8,
-    LOCAL_EGL_GREEN_SIZE,      8,
-    LOCAL_EGL_BLUE_SIZE,       8,
-    LOCAL_EGL_ALPHA_SIZE,      0,
     EGL_ATTRIBS_LIST_SAFE_TERMINATION_WORKING_AROUND_BUGS
 };
 
 static const EGLint kEGLConfigAttribsRGB16[] = {
     LOCAL_EGL_SURFACE_TYPE,    LOCAL_EGL_WINDOW_BIT,
     LOCAL_EGL_RENDERABLE_TYPE, LOCAL_EGL_OPENGL_ES2_BIT,
     LOCAL_EGL_RED_SIZE,        5,
     LOCAL_EGL_GREEN_SIZE,      6,