Skip to content

Commit 5371a32

Browse files
committed
Bug 1828248 - Update gleam to 0.15. r=gfx-reviewers,supply-chain-reviewers,jrmuizel
This provides us with QCOM_tiled_rendering, which will be used in the next patch in this series. Differential Revision: https://phabricator.services.mozilla.com/D176153 [ghsync] From https://hg.mozilla.org/mozilla-central/rev/290aaac29717935c1eba667c9a566907ba08c53b
1 parent 38494e4 commit 5371a32

File tree

8 files changed

+62
-8
lines changed

8 files changed

+62
-8
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example-compositor/compositor/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "MPL-2.0"
77

88
[dependencies]
99
webrender = { path = "../../webrender" }
10-
gleam = "0.13.1"
10+
gleam = "0.15"
1111

1212
[target.'cfg(windows)'.dependencies]
1313
compositor-windows = { path = "../compositor-windows" }

examples/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ debug = ["webrender/capture", "webrender/profiler"]
5757
app_units = "0.7"
5858
env_logger = { version = "0.10", default_features = false }
5959
euclid = "0.22"
60-
gleam = "0.13"
60+
gleam = "0.15"
6161
glutin = "0.28"
6262
rayon = "1"
6363
webrender = { path = "../webrender" }

swgl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ glsl-to-cxx = { path = "../glsl-to-cxx" }
1212
webrender_build = { path = "../webrender_build" }
1313

1414
[dependencies]
15-
gleam = "0.13.1"
15+
gleam = "0.15"

swgl/src/swgl_fns.rs

+54
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,16 @@ impl Gl for Context {
964964
}
965965
}
966966

967+
fn bind_vertex_buffer(
968+
&self,
969+
binding_index: GLuint,
970+
buffer: GLuint,
971+
offset: GLintptr,
972+
stride: GLint,
973+
) {
974+
unimplemented!("Not supported by SWGL");
975+
}
976+
967977
fn bind_texture(&self, target: GLenum, texture: GLuint) {
968978
//panic!();
969979
unsafe {
@@ -1405,6 +1415,10 @@ impl Gl for Context {
14051415
panic!();
14061416
}
14071417

1418+
fn vertex_attrib_binding(&self, attrib_index: GLuint, binding_index: GLuint) {
1419+
unimplemented!("Not supported by SWGL");
1420+
}
1421+
14081422
fn vertex_attrib_pointer_f32(
14091423
&self,
14101424
index: GLuint,
@@ -1469,6 +1483,31 @@ impl Gl for Context {
14691483
}
14701484
}
14711485

1486+
fn vertex_attrib_format(
1487+
&self,
1488+
attrib_index: GLuint,
1489+
size: GLint,
1490+
type_: GLenum,
1491+
normalized: bool,
1492+
relative_offset: GLuint,
1493+
) {
1494+
unimplemented!("Not supported by SWGL");
1495+
}
1496+
1497+
fn vertex_attrib_i_format(
1498+
&self,
1499+
attrib_index: GLuint,
1500+
size: GLint,
1501+
type_: GLenum,
1502+
relative_offset: GLuint,
1503+
) {
1504+
unimplemented!("Not supported by SWGL");
1505+
}
1506+
1507+
fn vertex_binding_divisor(&self, binding_index: GLuint, divisor: GLuint) {
1508+
unimplemented!("Not supported by SWGL");
1509+
}
1510+
14721511
fn viewport(&self, x: GLint, y: GLint, width: GLsizei, height: GLsizei) {
14731512
debug!("viewport {} {} {} {}", x, y, width, height);
14741513
//panic!();
@@ -2285,6 +2324,21 @@ impl Gl for Context {
22852324
fn flush_mapped_buffer_range(&self, target: GLenum, offset: GLintptr, length: GLsizeiptr) {
22862325
unimplemented!("Not supported by SWGL");
22872326
}
2327+
2328+
fn start_tiling_qcom(
2329+
&self,
2330+
x: GLuint,
2331+
y: GLuint,
2332+
width: GLuint,
2333+
height: GLuint,
2334+
preserve_mask: GLbitfield,
2335+
) {
2336+
unimplemented!("Not supported by SWGL");
2337+
}
2338+
2339+
fn end_tiling_qcom(&self, preserve_mask: GLbitfield) {
2340+
unimplemented!("Not supported by SWGL");
2341+
}
22882342
}
22892343

22902344
/// A resource that is intended for sharing between threads.

webrender/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bitflags = "1.2"
3232
byteorder = "1.0"
3333
euclid = { version = "0.22.0", features = ["serde"] }
3434
fxhash = "0.2.1"
35-
gleam = "0.13.1"
35+
gleam = "0.15.0"
3636
lazy_static = "1"
3737
log = "0.4"
3838
malloc_size_of_derive = "0.1"

wr_glyph_rasterizer/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ serde = { optional = true, version = "1.0", features = ["serde_derive"] }
3232
[dev-dependencies]
3333
env_logger = { version = "0.10", default_features = false }
3434
euclid = "0.22"
35-
gleam = "0.13"
35+
gleam = "0.15"
3636
glutin = "0.28"
3737
rayon = "1"
3838
winit = "0.26"

wrench/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ path = "src/main.rs"
1414
[dependencies]
1515
base64 = "0.13"
1616
env_logger = { version = "0.10", optional = true, default_features = false }
17-
gleam = "0.13"
17+
gleam = "0.15"
1818
glutin = "0.28"
1919
clap = { version = "3.1", features = ["yaml"] }
2020
glsl-lang = { version = "0.2", features = ["lexer-v2-full"] }

0 commit comments

Comments
 (0)