[hal/vulkan] Don't advertise features without prerequisites present. #5460
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
teoxoy
requested changes
Apr 2, 2024
There was a problem hiding this comment.
I feel like it would be easier to just inline the requirements.
features.set(F::STORAGE_RESOURCE_BINDING_ARRAY,
(features.contains(F::BUFFER_BINDING_ARRAY) && self.core.shader_storage_buffer_array_dynamic_indexing != 0) ||
(features.contains(F::TEXTURE_BINDING_ARRAY) && self.core.shader_storage_image_array_dynamic_indexing != 0)
);
features.set(F::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING,
(features.contains(F::TEXTURE_BINDING_ARRAY) && descriptor_indexing.shader_sampled_image_array_non_uniform_indexing != 0) &&
(features.contains(F::BUFFER_BINDING_ARRAY | F::STORAGE_RESOURCE_BINDING_ARRAY) && descriptor_indexing.shader_storage_buffer_array_non_uniform_indexing != 0)
);
features.set(F::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING,
(features.contains(F::BUFFER_BINDING_ARRAY) && descriptor_indexing.shader_uniform_buffer_array_non_uniform_indexing != 0) &&
(features.contains(F::TEXTURE_BINDING_ARRAY | F::STORAGE_RESOURCE_BINDING_ARRAY) && descriptor_indexing.shader_storage_image_array_non_uniform_indexing != 0)
);
And remove the helper function altogether? ... I strongly agree. |
|
Yeah, I think it's more straightforward. Especially here because |
|
any movement on this one? |
jimblandy
force-pushed
the
hal-vulkan-actually-require-some-prerequisite
branch
2 times, most recently
from
71c2c33 to
f7cb8fd
Compare
|
@jimblandy looks like CI is failing. |
Don't advertise features like `STORAGE_RESOURCE_BINDING_ARRAY` unless at least one of the features it extends, like `BUFFER_BINDING_ARRAY` or `TEXTURE_BINDING_ARRAY`, is actually present. Replace the calls to `all_features_supported` with the equivalent inline code, and delete the function.
jimblandy
force-pushed
the
hal-vulkan-actually-require-some-prerequisite
branch
from
f7cb8fd to
261ab09
Compare
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.
Don't advertise features like
STORAGE_RESOURCE_BINDING_ARRAYunless at least one of the features it extends, likeBUFFER_BINDING_ARRAYorTEXTURE_BINDING_ARRAY, is actually present.See the comments on
PhysicalDevicefeatures::prequisites_satisfiedfor more details.