Use active uniforms data to implement gl.uniform* checks #21184

nox · 2018-07-16T09:56:51Z

This change is

highfive · 2018-07-16T09:56:55Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/bindings/trace.rs, components/script/dom/webglprogram.rs, components/script/dom/webgluniformlocation.rs
@KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/bindings/trace.rs, components/script/dom/webglprogram.rs, components/script/dom/webgluniformlocation.rs

highfive · 2018-07-16T09:56:57Z

Warning

These commits modify unsafe code. Please review it carefully!

jdm

This looks good, but there's also a lot of duplication of checks. It would be good to file a followup issue to figure out way to reduce the duplication, similar to https://searchfox.org/mozilla-central/source/dom/canvas/WebGLContextGL.cpp#1964-2061.

jdm · 2018-07-16T17:09:25Z

components/script/dom/webglrenderingcontext.rs

+    ) {
+        self.with_location(location, |location| {
+            match location.type_() {
+                constants::FLOAT_VEC2 => {}


I believe we want to keep handling booleans in other methods as well - https://www.khronos.org/registry/OpenGL-Refpages/es3.0/ says:

Either the i, ui or f variants may be used to provide values for uniform variables of type bool, bvec2, bvec3, bvec4, or arrays of these. The uniform variable will be set to false if the input value is 0 or 0.0f, and it will be set to true otherwise.

jdm · 2018-07-16T18:33:19Z

error: unused import: `WebGLResult`
 --> components/script/dom/webgluniformlocation.rs:6:44
  |
6 | use canvas_traits::webgl::{WebGLProgramId, WebGLResult};
  |                                            ^^^^^^^^^^^
  |
  = note: `-D unused-imports` implied by `-D warnings`
error: aborting due to previous error
error: Could not compile `script`.

nox · 2018-07-16T22:45:17Z

I reduced the duplication a tad bit but I'll file an issue later about that.

I also fixed the various boolean uniforms that were missing.

nox · 2018-07-16T22:45:23Z

@bors-servo r=jdm

bors-servo · 2018-07-16T22:45:23Z

📌 Commit 1c585c3 has been approved by jdm

bors-servo · 2018-07-16T22:45:28Z

⌛ Testing commit 1c585c3 with merge 5217314...

Use active uniforms data to implement gl.uniform* checks  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21184)

Fixed the boolean stuff and will file an issue for the duplication.

bors-servo · 2018-07-16T23:07:44Z

💔 Test failed - linux-rel-css

jdm · 2018-07-16T23:16:10Z

  ▶ CRASH [expected OK] /_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html
  │ 
  │ VMware, Inc.
  │ softpipe
  │ 3.3 (Core Profile) Mesa 18.1.0-devel
  │ DESCRIPTION: WebGL GLSL conformance test: gl_FragCoord_001_to_003.html
  │ 
  │ test: gl_FragCoord_xy_frag.test.html
  │ loading: ../default/default.vert
  │ loading: gl_FragCoord_xy_frag_ref.frag
  │ loading: ../default/default.vert
  │ loading: gl_FragCoord_xy_frag.frag
  │ loaded: gl_FragCoord_xy_frag_ref.frag
  │ loaded: ../default/default.vert
  │ 
  │ loaded: ../default/default.vert
  │ loaded: gl_FragCoord_xy_frag.frag
  │ 
  │ PASS images are the same
  │ PASS getError was expected value: NO_ERROR : there should be no errors
  │ 
  │ test: gl_FragCoord_z_frag.test.html
  │ loading: gl_FragCoord_z_frag_ref.vert
  │ loading: gl_FragCoord_z_frag_ref.frag
  │ loading: ../default/default.vert
  │ loading: gl_FragCoord_z_frag.frag
  │ loaded: gl_FragCoord_z_frag_ref.vert
  │ loaded: gl_FragCoord_z_frag_ref.frag
  │ 
  │ assertion failed: location >= 0 (thread WebGLThread, at components/canvas/webgl_thread.rs:1120)
  │ stack backtrace:
  │    0:     0x7fd2ef19241c - backtrace::backtrace::trace::h48eb2921f133e389
  │    1:     0x7fd2ef192252 - <backtrace::capture::Backtrace as core::default::Default>::default::h00deb8ea10633b85
  │    2:     0x7fd2ef192298 - backtrace::capture::Backtrace::new::h6d1048ca147e297d
  │    3:     0x7fd2ec4e2728 - servo::main::{{closure}}::h343b2e747a03b7e2
  │    4:     0x7fd2ef1bbad3 - std::panicking::rust_panic_with_hook::hf121af3526fe4125
  │                         at libstd/panicking.rs:479
  │    5:     0x7fd2ee00a476 - std::panicking::begin_panic::h06fa6a45cd442aff
  │    6:     0x7fd2ee0206ad - canvas::webgl_thread::WebGLImpl::apply::haa471dfb2c5427b9
  │    7:     0x7fd2ee01cc48 - <canvas::webgl_thread::WebGLThread<VR, OB>>::handle_msg::h4a10c052a0820ae4
  │    8:     0x7fd2ee009e25 - std::sys_common::backtrace::__rust_begin_short_backtrace::h817ad4c5b5af86ee
  │    9:     0x7fd2ee00a4d8 - _ZN3std9panicking3try7do_call17hd4ba12f5477611fcE.llvm.15623415505575742723
  │   10:     0x7fd2ef1cd499 - __rust_maybe_catch_panic
  │                         at libpanic_unwind/lib.rs:105
  │   11:     0x7fd2ee0120f6 - <F as alloc::boxed::FnBox<A>>::call_box::h67a22db4f56cc3f6
  │   12:     0x7fd2ef1a66fa - <alloc::boxed::Box<(dyn alloc::boxed::FnBox<A, Output$u3d$R$GT$$u20$$u2b$$u20$$u27$a$RP$$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::haf969131982fb97c
  │                         at /checkout/src/liballoc/boxed.rs:650
  │                          - std::sys_common::thread::start_thread::hcbfc448db5968f29
  │                         at libstd/sys_common/thread.rs:24
  │   13:     0x7fd2ef1a4985 - std::sys::unix::thread::Thread::new::thread_start::ha4b2330dc32d1193
  │                         at libstd/sys/unix/thread.rs:90
  │   14:     0x7fd2eb3bd183 - start_thread
  │   15:     0x7fd2e9c8403c - clone
  │   16:                0x0 - <unknown>

nox · 2018-07-16T23:46:01Z

Needed to check for gl_ prefix.

@bors-servo r=jdm

bors-servo · 2018-07-16T23:46:02Z

📌 Commit 476640c has been approved by jdm

bors-servo · 2018-07-16T23:46:07Z

⌛ Testing commit 476640c with merge 3003e6f...

Use active uniforms data to implement gl.uniform* checks  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21184)

bors-servo · 2018-07-17T01:07:59Z

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing 3003e6f to master...

nox added 3 commits July 11, 2018 11:55

Remove WebGLCommand::GetActiveAttrib

a5b8009

Store active uniforms on the DOM side

cbac5d0

Move ANGLE name shenanigans to WebGL thread

e7631ce

highfive assigned asajeffrey Jul 16, 2018

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 16, 2018

jdm previously requested changes Jul 16, 2018

View reviewed changes

jdm assigned jdm and unassigned asajeffrey Jul 16, 2018

jdm added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 16, 2018

nox force-pushed the webgl branch from 1ede23c to 1c585c3 Compare July 16, 2018 22:44

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Jul 16, 2018

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 16, 2018

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 16, 2018

Use active uniforms data to implement gl.uniform* checks

476640c

nox force-pushed the webgl branch from 1c585c3 to 476640c Compare July 16, 2018 23:26

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 16, 2018

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 16, 2018

bors-servo merged commit 476640c into master Jul 17, 2018

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 17, 2018

bors-servo mentioned this pull request Jul 17, 2018

Replace mpsc with crossbeam-channel #19515

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use active uniforms data to implement gl.uniform* checks #21184

Use active uniforms data to implement gl.uniform* checks #21184

nox commented Jul 16, 2018 •

edited by SimonSapin

highfive commented Jul 16, 2018

highfive commented Jul 16, 2018

jdm left a comment

jdm Jul 16, 2018

jdm commented Jul 16, 2018

nox commented Jul 16, 2018

nox commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 16, 2018

jdm commented Jul 16, 2018

nox commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 17, 2018

Use active uniforms data to implement gl.uniform* checks #21184

Use active uniforms data to implement gl.uniform* checks #21184

Conversation

nox commented Jul 16, 2018 • edited by SimonSapin

highfive commented Jul 16, 2018

highfive commented Jul 16, 2018

jdm left a comment

Choose a reason for hiding this comment

jdm Jul 16, 2018

Choose a reason for hiding this comment

jdm commented Jul 16, 2018

nox commented Jul 16, 2018

nox commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 16, 2018

jdm commented Jul 16, 2018

nox commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 16, 2018

bors-servo commented Jul 17, 2018

nox commented Jul 16, 2018 •

edited by SimonSapin