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.

Sign up for GitHub

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

Jump to bottom

Fix some texture conversions #21646

Merged
merged 5 commits into from Sep 9, 2018
Merged

Fix some texture conversions #21646

merged 5 commits into from Sep 9, 2018

Conversation

nox
Copy link
Contributor

@nox nox commented Sep 8, 2018 •
edited by SimonSapin

This change is Reviewable

@highfive
Copy link

highfive commented Sep 8, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs
  • @jgraham: tests/wpt/webgl/meta/conformance/textures/image_data/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini, tests/wpt/webgl/meta/conformance/textures/image/tex-2d-luminance-luminance-unsigned_byte.html.ini, tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini, tests/wpt/webgl/meta/conformance/textures/image_data/tex-2d-luminance-luminance-unsigned_byte.html.ini, tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini and 2 more
  • @KiChjang: components/script/dom/webglrenderingcontext.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 8, 2018
@nox
Fix the LUMINANCE_ALPHA case of rgba8_image_to_tex_image_data
9a36239 
The internal format and format values match, thus the canvas or image input
must be interpreted as already in LUMINANCE_ALPHA format.
@nox
Fix the LUMINANCE of rgba8_image_to_tex_image_data
e61c7b7 
The internal format and format values match, thus the canvas or image input
must be interpreted as already in LUMINANCE format.
@nox
Remove some useless argument mutability
f726f18 
I wonder why this doesn't trigger a warning.
@nox
Fix the UNSIGNED_SHORT_5_5_5_1 case of premultiply_pixels
d8b7394
@nox
Fix the UNSIGNED_SHORT_4_4_4_4 case of premultiply_pixels
6d3609d
@jdm
Copy link
Member

jdm commented Sep 9, 2018

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 6d3609d has been approved by jdm

@highfive highfive assigned jdm and unassigned SimonSapin Sep 9, 2018
@highfive 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 Sep 9, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 6d3609d with merge 186393a...

bors-servo pushed a commit that referenced this pull request Sep 9, 2018
Auto merge of #21646 - servo:webgl, r=jdm
186393a 
Fix some texture conversions

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21646)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ 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 186393a to master...

@bors-servo bors-servo merged commit 6d3609d into master Sep 9, 2018
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nox @highfive @jdm @bors-servo @SimonSapin