Bug 1507915 - Update webrender to commit 91910a3ce033239fe36ef096223be333ea5df6d7 (WR PR #3314). r=kats
authorWR Updater Bot <graphics-team@mozilla.staktrace.com>
Fri, 16 Nov 2018 20:18:34 +0000
changeset 503269 4734eb8285bda7fdfe8852ce99bd2f7ad70adfb9
parent 503268 d3468dd807eb970c794257cde9f48650bbf7d7bd
child 503270 dea39df5254abb0b39ef52cbbc83dc5a0e7755d6
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1507915
milestone65.0a1
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
Bug 1507915 - Update webrender to commit 91910a3ce033239fe36ef096223be333ea5df6d7 (WR PR #3314). r=kats Differential Revision: https://phabricator.services.mozilla.com/D12171
gfx/webrender/src/device/gl.rs
gfx/webrender_bindings/revision.txt
--- a/gfx/webrender/src/device/gl.rs
+++ b/gfx/webrender/src/device/gl.rs
@@ -999,24 +999,28 @@ impl Device {
                         TexStorageUsage::NonBGRA8
                     } else {
                         TexStorageUsage::Never
                     },
                 )
             }
         } else {
             // BGRA is not supported as an internal format, therefore we will
-            // use RGBA and swizzle during upload. Note that this is not
-            // supported on GLES.
+            // use RGBA. On non-gles we can swizzle during upload. This is not
+            // allowed on gles, so we must us RGBA for the external format too.
+            // Red and blue will appear reversed, but it is the best we can do.
             // Since the internal format will actually be RGBA, if texture
             // storage is supported we can use it for such textures.
-            assert_ne!(gl.get_type(), gl::GlType::Gles, "gles must have compatible internal and external formats");
             (
                 gl::RGBA8,
-                gl::BGRA,
+                if gl.get_type() == gl::GlType::Gles {
+                    gl::RGBA
+                } else {
+                    gl::BGRA
+                },
                 if supports_texture_storage {
                     TexStorageUsage::Always
                 } else {
                     TexStorageUsage::Never
                 },
             )
         };
 
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1,1 +1,1 @@
-5609676e166f939fcf1a4141c5b9cb715b68f1d9
+91910a3ce033239fe36ef096223be333ea5df6d7