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

Add a rendering path for Direct3D 11-class hardware that uses compute shader for most stages. #350

Merged
merged 26 commits into from Jun 23, 2020

Conversation

@pcwalton
Copy link
Collaborator

pcwalton commented Jun 4, 2020

Right now this is only for testing.

@pcwalton pcwalton marked this pull request as draft Jun 4, 2020
@pcwalton pcwalton force-pushed the pcwalton:gpu-tiling-dicing branch 8 times, most recently from 160711b to f5f9414 Jun 4, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2020

The latest upstream changes (presumably #347) made this pull request unmergeable. Please resolve the merge conflicts.

@pcwalton pcwalton force-pushed the pcwalton:gpu-tiling-dicing branch from 9591491 to 7f06486 Jun 23, 2020
@pcwalton pcwalton force-pushed the pcwalton:gpu-tiling-dicing branch from 7f06486 to e3a966c Jun 23, 2020
@pcwalton pcwalton marked this pull request as ready for review Jun 23, 2020
@pcwalton
Copy link
Collaborator Author

pcwalton commented Jun 23, 2020

@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2020

📌 Commit e3a966c has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2020

Testing commit e3a966c with merge da55fc2...

bors-servo added a commit that referenced this pull request Jun 23, 2020
Add a rendering path for Direct3D 11-class hardware that uses compute shader for most stages.

Right now this is only for testing.
@pcwalton pcwalton merged commit 3dc70e0 into servo:master Jun 23, 2020
1 of 3 checks passed
1 of 3 checks passed
Travis CI - Pull Request Build Errored
Details
homu Testing commit e3a966cc99cf6c273a0fe4195671b293ae7c0557 with merge da55fc2465ddd35da411c7f4649372d97e6533d4...
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bors-servo
Copy link
Contributor

bors-servo commented Jun 24, 2020

💥 Test timed out

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

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