Backed out changeset 106776ac6c20 (bug 1615694) for tidy build bustages.

CLOSED TREE

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/9571edde56aaa5a3a3474bc1c042c6c42e80f25f

direct-composition/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 
 [target.'cfg(windows)'.dependencies]
 euclid = "0.20"
-gleam = "0.9.2"
+gleam = "0.6.2"
 mozangle = {version = "0.3.1", features = ["egl"]}
 webrender = {path = "../webrender"}
 winapi = {version = "0.3", features = ["winerror", "d3d11", "dcomp"]}

example-compositor/compositor/Cargo.toml

@@ -7,7 +7,7 @@ license = "MPL-2.0"
 
 [dependencies]
 webrender = { path = "../../webrender" }
-gleam = "0.9.2"
+gleam = "0.6.2"
 
 [target.'cfg(windows)'.dependencies]
 compositor-windows = { path = "../compositor-windows" }

examples/Cargo.toml

@@ -61,7 +61,7 @@ debug = ["webrender/capture", "webrender/debugger", "webrender/profiler"]
 app_units = "0.7"
 env_logger = "0.5"
 euclid = "0.20"
-gleam = "0.9.2"
+gleam = "0.6.2"
 glutin = "0.21"
 rayon = "1"
 webrender = { path = "../webrender" }

webrender/Cargo.toml

@@ -32,7 +32,7 @@ cfg-if = "0.1.2"
 cstr = "0.1.2"
 euclid = { version = "0.20.0", features = ["serde"] }
 fxhash = "0.2.1"
-gleam = "0.9.2"
+gleam = "0.6.17"
 image_loader = { optional = true, version = "0.22", package = "image", default-features = false, features = ["png_codec"] }
 lazy_static = "1"
 log = "0.4"

webrender/src/device/gl.rs

@@ -949,8 +949,6 @@ pub struct Capabilities {
     /// Whether the driver supports uploading to textures from a non-zero
     /// offset within a PBO.
     pub supports_nonzero_pbo_offsets: bool,
-    /// Whether the driver supports specifying the texture usage up front.
-    pub supports_texture_usage: bool,
 }
 
 #[derive(Clone, Debug)]
@@ -1311,8 +1309,6 @@ impl Device {
             gl.provoking_vertex_angle(gl::FIRST_VERTEX_CONVENTION);
         }
 
-        let supports_texture_usage = supports_extension(&extensions, "GL_ANGLE_texture_usage");
-
         // Our common-case image data in Firefox is BGRA, so we make an effort
         // to use BGRA as the internal texture storage format to avoid the need
         // to swizzle during upload. Currently we only do this on GLES (and thus
@@ -1484,7 +1480,6 @@ impl Device {
                 supports_khr_debug,
                 supports_texture_swizzle,
                 supports_nonzero_pbo_offsets,
-                supports_texture_usage,
             },
 
             color_formats,
@@ -2089,10 +2084,6 @@ impl Device {
         self.bind_texture(DEFAULT_TEXTURE, &texture, Swizzle::default());
         self.set_texture_parameters(texture.target, filter);
 
-        if self.capabilities.supports_texture_usage && render_target.is_some() {
-            self.gl.tex_parameter_i(texture.target, gl::TEXTURE_USAGE_ANGLE, gl::FRAMEBUFFER_ATTACHMENT_ANGLE as gl::GLint);
-        }
-
         // Allocate storage.
         let desc = self.gl_describe_format(texture.format);
         let is_array = match texture.target {

wrench/Cargo.toml

@@ -12,7 +12,7 @@ bincode = "1.0"
 byteorder = "1.0"
 env_logger = { version = "0.5", optional = true }
 euclid = "0.20"
-gleam = "0.9.2"
+gleam = "0.6.2"
 glutin = "0.21"
 app_units = "0.7"
 clap = { version = "2", features = ["yaml"] }