Skip to content

/ webxr

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

Be more flexible in picking formats #69

Merged
merged 1 commit into from Oct 8, 2019
Merged

Be more flexible in picking formats #69

merged 1 commit into from Oct 8, 2019
+25 −10

Conversation

@Manishearth
Copy link
Member

Manishearth commented Oct 8, 2019

Fixes #68

These are the only two formats that I've seen get requested, as the warning shows further ones we should add support

r? @jdm
@Manishearth
Be more flexible in picking formats
Loading status checks…
9a2fa7a
@jdm
jdm approved these changes Oct 8, 2019
View changes
Copy link
Member

jdm left a comment

No more panics in my emulator.
@Manishearth
Copy link
Member Author

Manishearth commented Oct 8, 2019

The full list of formats I get from the device is [87, 91, 28, 29, 55, 45, 40, 20]
@Manishearth
Copy link
Member Author

Manishearth commented Oct 8, 2019 

DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_D24_UNORM_S8_UINT
DXGI_FORMAT_D32_FLOAT, DXGI_FORMAT_D32_FLOAT_S8X24_UINT

I believe the other formats are for depth/stencil which we currently are not copying?
@Manishearth
Copy link
Member Author

Manishearth commented Oct 8, 2019

glReadPixels doesn't seem to allow specifying sRGB values so I think we support everything we can here

eventually we may need a depth and stencil swapchain but we can defer that till surfman (cc @asajeffrey )

this does work, however, so

@bors-servo r=jdm
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

📌 Commit 9a2fa7a has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

⌛ Testing commit 9a2fa7a with merge ee9caca...
bors-servo added a commit that referenced this pull request Oct 8, 2019
@bors-servo
Auto merge of #69 - Manishearth:pixformat, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
ee9caca 
Be more flexible in picking formats

Fixes #68

These are the only two formats that I've seen get requested, as the warning shows further ones we should add support

r? @jdm
@bors-servo
Copy link
Contributor

bors-servo commented Oct 8, 2019

☀️ Test successful - checks-travis
Approved by: jdm
Pushing ee9caca to master...
@bors-servo bors-servo merged commit 9a2fa7a into servo:master Oct 8, 2019
3 checks passed
3 checks passed
Travis CI - Pull Request Build Passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Manishearth Manishearth deleted the Manishearth:pixformat branch Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Panic creating the d3d texture in openxr
3 participants
@Manishearth @bors-servo @jdm
You can’t perform that action at this time.