Implement ETC2 and ASTC textures #1074
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![monocodus[bot]](https://avatars.githubusercontent.com/in/28526?s=60&v=4){kind=small}
cwfitzgerald
force-pushed
the
astc-etc
branch
from
9d2716b to
bbc3705
Compare
kvark
reviewed
Dec 5, 2020
cwfitzgerald
force-pushed
the
astc-etc
branch
from
bbc3705 to
42d70cb
Compare
cwfitzgerald
force-pushed
the
astc-etc
branch
3 times, most recently
from
bafc8e2 to
5a4b3bc
Compare
|
I fixed up the validation to better deal with the difference between virtual and physical sizes in compressed texture mips. Could you review the latest commit as that's entirely new code. |
kvark
reviewed
Dec 5, 2020
| /// Take `value` and round it up to the nearest alignment `alignment`. | ||
| /// | ||
| /// ```text | ||
| /// (0, 3) -> 0 |
There was a problem hiding this comment.
should this be written as Rust assertions?
There was a problem hiding this comment.
I tried, but because the conv module isn't visible from the outside, and doctests are technically completely different crates, I couldn't actually call the function in the doctest.
wgpu-types/src/lib.rs
Outdated
| @@ -1881,8 +1881,8 @@ impl Extent3d { | |||
| let block_width = block_width as u32; | |||
| let block_height = block_height as u32; | |||
|
|
|||
| let width = ((self.width + block_width - 1) / block_width) * block_width; | |||
| let height = ((self.height + block_height - 1) / block_height) * block_height; | |||
| let width = (((self.width + block_width) - 1) / block_width) * block_width; | |||
There was a problem hiding this comment.
... I thought I was fixing precidence but I didn't change it at all, let me give this another look
cwfitzgerald
force-pushed
the
astc-etc
branch
from
5a4b3bc to
d805a19
Compare
|
Please rebase and land this! |
cwfitzgerald
force-pushed
the
astc-etc
branch
from
d805a19 to
19fb491
Compare
|
Thanks for the review! bors r=kvark |
bors bot
added a commit
to gfx-rs/wgpu-rs
that referenced
this pull request
Dec 6, 2020
664: Integrate ETC and ASTC textures in Skybox example r=kvark a=cwfitzgerald Depends on gfx-rs/wgpu#1074 Converts skybox example to mip-mapped files in: - Bgra8 - Bc1 - ETC2 - ASTC4x4 Looks quite good now with mipmapping and trilinear filtering even at small resolutions. Co-authored-by: Connor Fitzgerald <[email protected]>
kvark
pushed a commit
to kvark/wgpu
that referenced
this pull request
Jun 3, 2021
664: Integrate ETC and ASTC textures in Skybox example r=kvark a=cwfitzgerald Depends on gfx-rs#1074 Converts skybox example to mip-mapped files in: - Bgra8 - Bc1 - ETC2 - ASTC4x4 Looks quite good now with mipmapping and trilinear filtering even at small resolutions. Co-authored-by: Connor Fitzgerald <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connections
Closes #1070. Makes progress towards #1069.
Description
This PR has multiple functions:
Extent3dthat help in calculating mip sizes:at_mip_level,max_mips, andphysical_size.TextureFormat::describefunction. I have used a decl macro to ease in the declaration and modifcation of an otherwise horribly verbose function.I have tried to use clever multi-select based data copying to reduce the possibility for errors, but there's a lot of data moving around here.
Testing
Upcoming wgpu-rs pr adding wider compressed texture support to the skybox example. Helper functions were tested with doctests.
Marked as draft until I can get the wgpu-rs pr done and prove it works, it is, however, ready for review.