Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set more ANGLE shader translation properties for WebGL 2 #25344

Merged
merged 1 commit into from Jan 8, 2020

Conversation

@jdm
Copy link
Member

jdm commented Dec 19, 2019

Fixes #25034.

@highfive
Copy link

highfive commented Dec 19, 2019

Heads up! This PR modifies the following files:

@highfive
Copy link

highfive commented Dec 19, 2019

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm jdm force-pushed the jdm:webgl2-program-link branch from fa866fc to b5911a4 Dec 19, 2019
@jdm
Copy link
Member Author

jdm commented Dec 19, 2019

@bors-servo try=wpt

@bors-servo
Copy link
Contributor

bors-servo commented Dec 19, 2019

Trying commit b5911a4 with merge fdffa80...

bors-servo added a commit that referenced this pull request Dec 19, 2019
webgl: Set more ANGLE shader translation properties for WebGL 2.
@jdm jdm changed the title webgl: Set more ANGLE shader translation properties for WebGL 2. Set more ANGLE shader translation properties for WebGL 2 Dec 19, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Dec 19, 2019

💔 Test failed - status-taskcluster

Copy link
Member

asajeffrey left a comment

Some nits but mostly LGTM.

components/canvas/webgl_limits.rs Outdated Show resolved Hide resolved
components/canvas/webgl_thread.rs Show resolved Hide resolved
components/script/dom/webglshader.rs Show resolved Hide resolved
@jdm
Copy link
Member Author

jdm commented Dec 19, 2019

  ▶ CRASH [expected ERROR] /_webgl/conformance2/uniforms/incompatible-texture-type-for-sampler.html
  │ 
  │ 
  │ 
  │ 
  │ [2019-12-19T22:21:01Z ERROR canvas::webgl_thread] Last GL operation failed: TexImage2D { target: 3553, level: 0, effective_internal_format: 6406, size: 1×1, format: Alpha, data_type: UnsignedByte, effective_data_type: 5121, unpacking_alignment: 4, alpha_treatment: None, y_axis_treatment: AsIs, pixel_format: None, data: IpcSharedMemory { os... }
  │ Unexpected WebGL error: 0x501 (1281) [TexImage2D { target: 3553, level: 0, effective_internal_format: 6406, size: 1×1, format: Alpha, data_type: UnsignedByte, effective_data_type: 5121, unpacking_alignment: 4, alpha_treatment: None, y_axis_treatment: AsIs, pixel_format: None, data: IpcSharedMemory { os... }] (thread WebGL thread, at components/canvas/webgl_thread.rs:1819)
 
  ▶ ERROR [expected OK] /_webgl/conformance2/programs/gl-get-frag-data-location.html
  │   → gl.getFragDataLocation is not a function
  │ 
  │ runTests@http://web-platform.test:8000/_webgl/conformance2/programs/gl-get-frag-data-location.html:95:17
  └ @http://web-platform.test:8000/_webgl/conformance2/programs/gl-get-frag-data-location.html:83:3
  ▶ Unexpected subtest result in /_webgl/conformance2/programs/gl-get-frag-data-location.html:
  │ FAIL [expected PASS] WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).
  │   → assert_true: successfullyParsed should be true (of type boolean). Was undefined (of type undefined). expected true got false
  │ 
  │ reportTestResultsToHarness/<@http://web-platform.test:8000/_webgl/js/js-test-pre.js:123:9
  │ Test.prototype.step@http://web-platform.test:8000/resources/testharness.js:1984:25
  │ test@http://web-platform.test:8000/resources/testharness.js:548:30
  │ reportTestResultsToHarness@http://web-platform.test:8000/_webgl/js/js-test-pre.js:122:7
  │ testFailed@http://web-platform.test:8000/_webgl/js/js-test-pre.js:249:5
  │ shouldBe@http://web-platform.test:8000/_webgl/js/js-test-pre.js:406:9
  │ shouldBeTrue@http://web-platform.test:8000/_webgl/js/js-test-pre.js:432:29
  └ @http://web-platform.test:8000/_webgl/js/js-test-post.js:24:1
@jdm
Copy link
Member Author

jdm commented Dec 19, 2019

The gl-get-frag-data-location.html is new because the test previously returned early when the compiling the program failed. Now that it doesn't, we hit different errors.

The new GL error is almost certainly caused by disabling the compat mode, since it's using ALPHA.

@asajeffrey
Copy link
Member

asajeffrey commented Dec 19, 2019

Oh good, compat mode again.

@jdm jdm force-pushed the jdm:webgl2-program-link branch from b5911a4 to d6e1589 Jan 7, 2020
@highfive highfive removed the S-tests-failed label Jan 7, 2020
@jdm jdm force-pushed the jdm:webgl2-program-link branch from d6e1589 to 156ad64 Jan 7, 2020
@jdm
Copy link
Member Author

jdm commented Jan 7, 2020

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Jan 7, 2020

📌 Commit 156ad64 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Jan 7, 2020

Testing commit 156ad64 with merge 64f5a93...

bors-servo added a commit that referenced this pull request Jan 7, 2020
Set more ANGLE shader translation properties for WebGL 2

Fixes #25034.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 7, 2020

💔 Test failed - status-taskcluster

@jdm
Copy link
Member Author

jdm commented Jan 7, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Jan 7, 2020

Testing commit 156ad64 with merge 3f5cb0e...

bors-servo added a commit that referenced this pull request Jan 7, 2020
Set more ANGLE shader translation properties for WebGL 2

Fixes #25034.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 8, 2020

☀️ Test successful - status-taskcluster
Approved by: asajeffrey
Pushing 3f5cb0e to master...

@bors-servo bors-servo merged commit 156ad64 into servo:master Jan 8, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants
You can’t perform that action at this time.