1880013 - Update glslopt to 0.1.10 for C++20 fix

Status: RESOLVED FIXED

(Core :: Graphics: WebRender, task, P3)

Description

[Chris Peterson [:cpeterson]]

Update glslopt-rs to include C++20 fix https://github.com/jamienicol/glsl-optimizer/pull/8 (via glslopt-rs submodule update https://github.com/jamienicol/glslopt-rs/pull/8).

glsl-optimizer's c99_math.h #defines a signbit() macro, but this macro clobbers use of std::signbit() in clang's C++20 header files. We compile glsl-optimizer as C11 and C++, so we no longer need any of c99_math.h's C99 polyfill implementations. We can just use C's standard math.h.

cargo:warning=In file included from glsl-optimizer/src/compiler/glsl/lower_precision.cpp:37:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/vector:274:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/__bit_reference:15:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/algorithm:667:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/functional:493:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/__algorithm/search.h:16:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/utility:236:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/compare:144:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/__compare/compare_partial_order_fallback.h:13:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/__compare/partial_order.h:14:
cargo:warning=In file included from /Users/chris/.mozbuild/clang/bin/../include/c++/v1/__compare/weak_order.h:14:
cargo:warning=/Users/chris/.mozbuild/clang/bin/../include/c++/v1/__compare/strong_order.h:68:35: error: expected unqualified-id
cargo:warning= return _VSTD::signbit(__u) <=> _VSTD::signbit(__t);
cargo:warning= ^
cargo:warning=glsl-optimizer/include/c99_math.h:123:20: note: expanded from macro 'signbit'
cargo:warning=#define signbit(x) ((x) < 0.0f)

Comment 1

[Jamie Nicol [:jnicol] out of office until 6th Jan]

Thanks Chris! glslopt 0.1.10 has been published to crates.io

Comment 2

[Chris Peterson [:cpeterson]]

Attachment: Bug 1880013 - Update glslopt to 0.1.10 for C++20 fix. r?jnicol,#supply-chain-reviewers

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6c231ed79678
Update glslopt to 0.1.10 for C++20 fix. r=jnicol,supply-chain-reviewers

Comment 4

[Cristian Tuns]

Backed out for causing wrench bustages

• Backout link
• Push with failures
• Failure Log

Comment 5

[Jamie Nicol [:jnicol] out of office until 6th Jan]

Chris, in case it's not clear, I think you need to update gfx/wr/Cargo.lock. Running cargo build in gfx/wr/webrender for example should do that. Sorry I missed that in review!

Comment 6

[Chris Peterson [:cpeterson]]

(In reply to Jamie Nicol [:jnicol] from comment #5)

Chris, in case it's not clear, I think you need to update gfx/wr/Cargo.lock. Running cargo build in gfx/wr/webrender for example should do that. Sorry I missed that in review!

Yep. I ran cargo update and mach vendor rust in the root directory, but forgot to vendor in the gfx/wr directory.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6ab3e357bc78
Update glslopt to 0.1.10 for C++20 fix. r=jnicol,supply-chain-reviewers

Comment 8

[Cristian Tuns]

https://hg.mozilla.org/mozilla-central/rev/6ab3e357bc78