[0.5] Add Texture Descriptor Array Feature #3269
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
changed the title
Merged
kvark
approved these changes
Jun 9, 2020
Spriv-cross happily spits out Texture2D<float4> u_Textures[2] : register(t0);
SamplerState u_Sampler : register(s1);for layout(set = 0, binding = 0) uniform texture2D u_Textures[2];
layout(set = 0, binding = 1) uniform sampler u_Sampler;all the way down to shader model 4.0. Tbh it's not really that surprising, as it has to be compile time indexed, so it's no different for hardware than having two textures in a row. |
|
I don't think we should be exposing this feature in backends that don't yet support it. I.e. DX11 may be calling spirv_cross correctly, but the binding side will likely break before it gets to the shader. Are you testing this on anything? |
|
I just finished my example, and it doesn't seem to work on DX11, though without errors, so I have no idea if that's an issue with the DX11 backend, or what. I'll disable it on DX11 as I have no personal need for that backend. |
cwfitzgerald
force-pushed
the
texture-descriptor-array
branch
from
09f8728
to
4ba8c57
Compare
|
Thank you!
|
cwfitzgerald
force-pushed
the
texture-descriptor-array
branch
from
4ba8c57
to
8f73dfc
Compare
|
Should be good to go |
|
Build succeeded: |
bors bot
added a commit
to gfx-rs/wgpu
that referenced
this pull request
Jun 11, 2020
711: Implement Descriptor Array Extension r=kvark a=cwfitzgerald ## Connections Blocked on gfx-rs/gfx#3269 and does some funky git overrides to get CI to return meaningful results what will be removed once that PR lands and is published. ## Description This PR implements the `TEXTURE_BINDING_ARRAY` native extension. This allows users to specify a uniform sized array of textures for use in shaders. As a corollary, this PR rustifies the Bind Group and Bind Group Layout interface. Two main actions were taken when doing this: - Types that were able to be shared among wgt, wgc, and wgpu-rs were moved into wgt. - Types that had references to other wgpu-rs specific structures were duplicated into wgc with wgpu-rs structures replaced with the appropriate ID. Notes were added to the wgc types that they were duplicated directly from wgpu-rs. From what I can tell, this resulted in a significant reduction in code complexity when dealing with bind groups, favoring strong types over runtime assertions. Naga validation of arrays of textures was not implemented. Documentation was added to extensions to help users understand what underlying tech was being relied on as well as the platforms it should be expected to work on. I think this pattern should be implemented across the board for extensions as it makes them much more user friendly to use. ## Testing There is an example included in the wgpu-rs PR which was used for testing this feature. It worked on DX12, Vulkan, and Metal (MSL > 2.0), as was expected. Additionally the other examples were run and are still verified to run. Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
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.
This adds
Feature::TEXTURE_DESCRIPTOR_ARRAYwhich is unconditionally present on DX12, DX11, and Vulkan, > MTL 2.0 on Metal, and unavailable on OpenGL. Strictly speaking that feature might be supported on opengl, but I'd want to make sure the backend supported it first.A slightly concerning discovery is that Limits can't be extended without a breaking change, so descriptor indexing might have some issues. Thankfully this feature doesn't change the available limits.
TODO: