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

Sync changes from mozilla-central #3771

Merged
merged 3 commits into from Oct 9, 2019
Merged

Sync changes from mozilla-central #3771

merged 3 commits into from Oct 9, 2019

Conversation

@moz-gfx
Copy link

moz-gfx commented Oct 9, 2019

This change is Reviewable

Glenn Watson and others added 3 commits Oct 9, 2019
The framebuffer clear was accidentally removed due to a rebase
error. We need to clear the framebuffer (and z) here when the
non-picture caching path is active.

Differential Revision: https://phabricator.services.mozilla.com/D48600

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/6338cf051cbb48a83f836be063a1dcfc5936033f
…ulator error. r=gw

When uploading texture data with a PBO we currently ensure the PBO
is the size of `(height - 1) * stride + (width * bpp)`, ie the final row
only contains the width's worth of data, not the stride. This should
be okay, and works fine on other implementations, but the android
emulator thinks it is invalid and emits a GL_INVALID_OPERATION error
in the glTexSubImage* call. To avoid this, ensure that the PBO is the
full `height * stride` size.

Differential Revision: https://phabricator.services.mozilla.com/D48541

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/ca08f015b43046a0bde5eda45bcf307a82ae1724
@moz-gfx
Copy link
Author

moz-gfx commented Oct 9, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 9, 2019

📌 Commit 18acc7e has been approved by moz-gfx

@bors-servo
Copy link
Contributor

bors-servo commented Oct 9, 2019

Testing commit 18acc7e with merge 4a5fea6...

bors-servo added a commit that referenced this pull request Oct 9, 2019
Sync changes from mozilla-central
@bors-servo
Copy link
Contributor

bors-servo commented Oct 9, 2019

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: moz-gfx
Pushing 4a5fea6 to master...

@bors-servo bors-servo merged commit 18acc7e into servo:master Oct 9, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
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.

None yet

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