Bug 870375 - back out bug 869011 for startup crashes on devices
authorMichael Wu <mwu@mozilla.com>
Thu, 09 May 2013 13:01:22 -0400
changeset 138112 7ef0ed6ea2db75c5d0f8109195d91c818d3ac594
parent 138110 6e6ec8a3432106fe2fa2b782bf26507504cb2097 (current diff)
parent 138111 2795d46a9d46bbaea4ad86810c18b766d881069b (diff)
child 138113 17f93f12b0843cf6c52e90bc88d8b2117cc745ec
push id3752
push userlsblakk@mozilla.com
push dateMon, 13 May 2013 17:21:10 +0000
treeherdermozilla-aurora@1580544aef0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs870375, 869011
milestone23.0a1
Bug 870375 - back out bug 869011 for startup crashes on devices
--- a/content/canvas/test/reftest/reftest.list
+++ b/content/canvas/test/reftest/reftest.list
@@ -132,18 +132,18 @@ pref(webgl.force-layers-readback,true) r
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&aa&_____&preserve  wrapper.html?colors.png # Bug 844439
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&__&alpha&preserve  wrapper.html?colors.png # Bug 844439
 pref(webgl.force-layers-readback,true) random-if(B2G) == webgl-color-test.html?readback&aa&alpha&preserve  wrapper.html?colors.png # Bug 844439
 
 
 # Check alpha behavior:
 fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=1.0&nogl        wrapper.html?colors.png
 fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=1.0             wrapper.html?colors.png
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0&nogl        wrapper.html?black.png
-fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0             wrapper.html?black.png
+fails-if(B2G)  == webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0&nogl        wrapper.html?black.png
+fails-if(B2G)  == webgl-color-alpha-test.html?colorVal=0.0&alphaVal=1.0             wrapper.html?black.png
 
 fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&nogl        wrapper.html?colors.png
 fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0             wrapper.html?colors.png
 fuzzy-if(B2G,256,83)  == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&alpha&nogl  wrapper.html?white.png
 fails-if(B2G)         == webgl-color-alpha-test.html?colorVal=1.0&alphaVal=0.0&alpha       wrapper.html?white.png
 
 fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)  == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=1.0&nogl  wrapper.html?half-colors.png
 fuzzy(1,65536) fuzzy-if(B2G,256,83) fuzzy-if(Android||B2G,9,65536)  == webgl-color-alpha-test.html?colorVal=0.5&alphaVal=1.0       wrapper.html?half-colors.png
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -575,17 +575,19 @@ public:
   }
 
   gl::ShaderProgramType GetShaderProgram() const MOZ_OVERRIDE
   {
     if (mTextureTarget == LOCAL_GL_TEXTURE_EXTERNAL) {
       return gl::RGBAExternalLayerProgramType;
     }
     MOZ_ASSERT(mTextureTarget == LOCAL_GL_TEXTURE_2D);
-    return GetProgramTypeForTexture(this);
+    return mFormat == gfx::FORMAT_B8G8R8A8 || mFormat == gfx::FORMAT_B8G8R8X8
+           ? gl::BGRALayerProgramType
+           : gl::RGBALayerProgramType;
   }
 
   GLenum GetWrapMode() const MOZ_OVERRIDE
   {
     return LOCAL_GL_CLAMP_TO_EDGE;
   }
 
   bool IsValid() const MOZ_OVERRIDE;
--- a/image/test/reftest/bmp/bmp-1bpp/reftest.list
+++ b/image/test/reftest/bmp/bmp-1bpp/reftest.list
@@ -1,12 +1,12 @@
 # BMP 1BPP tests
 
 # Images of various sizes
-== bmp-size-1x1-1bpp.bmp   bmp-size-1x1-1bpp.png
+fails-if(B2G) == bmp-size-1x1-1bpp.bmp   bmp-size-1x1-1bpp.png
 == bmp-size-2x2-1bpp.bmp   bmp-size-2x2-1bpp.png
 == bmp-size-3x3-1bpp.bmp   bmp-size-3x3-1bpp.png
 == bmp-size-4x4-1bpp.bmp   bmp-size-4x4-1bpp.png
 == bmp-size-5x5-1bpp.bmp   bmp-size-5x5-1bpp.png
 == bmp-size-6x6-1bpp.bmp   bmp-size-6x6-1bpp.png
 == bmp-size-7x7-1bpp.bmp   bmp-size-7x7-1bpp.png
 == bmp-size-8x8-1bpp.bmp   bmp-size-8x8-1bpp.png
 == bmp-size-9x9-1bpp.bmp   bmp-size-9x9-1bpp.png