Fix ordering regression for VK_INSTANCE_LAYERS #1170
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
|
CI Vulkan-Loader build queued with queue ID 50980. |
1 similar comment
|
CI Vulkan-Loader build queued with queue ID 50980. |
|
CI Vulkan-Loader build # 1886 running. |
|
CI Vulkan-Loader build # 1886 failed. |
The commit to add VK_LOADER_LAYERS_ENABLE/DISABLE inadvertently broke the ordering guarantees of VK_INSTANCE_LAYERS. This commit restores that order. If both VK_INSTANCE_LAYERS and VK_LOADER_LAYERS_ENABLE add layers, the order will be VK_INSTANCE_LAYERS enabled layers, in the order specified by the env-var, followed by any layers enabled by VK_LOADER_LAYERS_ENABLED enabled in the order they are found on the system. In addition to this, the test framework receieved two changes: * Make env-var folders report their contents in a deterministic order (aka the order the items were added to the framework). This mirrors existing behavior for redirected folders. * Make platform shim resilient to shutdown ordering issues. Namely, set a flag during shutdown so that any interception functions go straight to the real version of the functoin. This works around an issue during the destruction of the FolderManagers for the environment variables, where the readdir shim function was trying to use the FolderManager's data but Address Sanitizer declared that such a use was 'heap use after free'. * Rename set_path to set_fake_path to better indicate its purpose
charles-lunarg
force-pushed
the
fix_env_var_ordering_regression
branch
from
1fdd8c6
to
5617210
Compare
|
CI Vulkan-Loader build queued with queue ID 51571. |
1 similar comment
|
CI Vulkan-Loader build queued with queue ID 51571. |
|
CI Vulkan-Loader build # 1887 running. |
|
CI Vulkan-Loader build # 1887 passed. |
|
Fixed the compilation issue on Windows, would appreciate a review since this is holding up VVL due to lack of order of VK_INSTANCE_LAYERS. |
MarkY-LunarG
approved these changes
Apr 5, 2023
|
So the CI runs that failed are the now removed Ubuntu 18 runners... |
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.
The commit to add VK_LOADER_LAYERS_ENABLE/DISABLE inadvertently broke the ordering guarantees of VK_INSTANCE_LAYERS. This commit restores that order. If both VK_INSTANCE_LAYERS and VK_LOADER_LAYERS_ENABLE add layers, the order will be VK_INSTANCE_LAYERS enabled layers, in the order specified by the env-var, followed by any layers enabled by VK_LOADER_LAYERS_ENABLED enabled in the order they are found on the system.
In addition to this, the test framework receieved two changes:
Fixes #1168