Skip to content

Commit

Permalink
Merge pull request #2121 from billhollings/vulkan-sdk-1.3.275
Browse files Browse the repository at this point in the history
Update dependency libraries to match Vulkan SDK 1.3.275.
  • Loading branch information
billhollings committed Jan 9, 2024
2 parents e65575c + cb46052 commit b5774b3
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Common/MVKCommonEnvironment.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ extern "C" {
* conflicts when bound to a Vulkan Loader that also exports identical symbols.
*/
#ifndef MVK_HIDE_VULKAN_SYMBOLS
# define MVK_HIDE_VULKAN_SYMBOLS 0
# define MVK_HIDE_VULKAN_SYMBOLS 1
#endif
#if MVK_HIDE_VULKAN_SYMBOLS
# define MVK_PUBLIC_VULKAN_SYMBOL
Expand Down
8 changes: 1 addition & 7 deletions Demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,7 @@ This demo renders a basic textured cube that spins in place.
The demo can be found in the `Cube` folder, and in the `Cube` group in the
*Xcode Project Navigator* in the `Demos.xcworkspace` *Xcode* workspace.

The _Cube_ demo uses _Volk_, which requires Vulkan API static call symbols (`vk*`) to be hidden.
Before building and running the _Cube_ demo, build **MoltenVK** with the `MVK_HIDE_VULKAN_SYMBOLS`
build setting enabled, such as with the following command-line command:

make MVK_HIDE_VULKAN_SYMBOLS=1

Then, to run this demo, run the `Cube-iOS`, `Cube-tvOS`, or `Cube-macOS` *Scheme* from within *Xcode*.
To run this demo, run the `Cube-macOS`, `Cube-iOS`, or `Cube-tvOS` *Scheme* from within *Xcode*.
In addition to devices, this demo will also run on the `iOS Simulator` or `tvOS Simulator` destinations.

The `Cube` demo is a simple example of installing **MoltenVK** as an `XCFramework` that is
Expand Down
3 changes: 2 additions & 1 deletion Docs/Whats_New.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Released 2024/01/08
- `VK_EXT_extended_dynamic_state3` *(Metal does not support `VK_POLYGON_MODE_POINT`)*
- `VK_EXT_headless_surface`
- `VK_EXT_layer_settings`
- **MoltenVK** build now hides static _Vulkan_ API symbols by default (build setting `MVK_HIDE_VULKAN_SYMBOLS=1` by default).
- Add support for format `VK_FORMAT_B4G4R4A4_UNORM_PACK16`.
- Add support for vertex formats `VK_FORMAT_B10G11R11_UFLOAT_PACK32` & `VK_FORMAT_E5B9G9R9_UFLOAT_PACK32`.
- Fix regression that broke `VK_POLYGON_MODE_LINE`.
Expand All @@ -48,7 +49,7 @@ Released 2024/01/08
- Deprecate `vkSetMoltenVKConfigurationMVK()`.
- Deprecate `mvk_config.h` and move content to `mvk_private_api.h` and `mvk_deprecated_api.h`.
- Update copyright notices to year 2024.
- Update dependency libraries to match _Vulkan SDK 1.3.273_.
- Update dependency libraries to match _Vulkan SDK 1.3.275_.
- Update to latest SPIRV-Cross:
- MSL: Fix regression error in argument buffer runtime arrays.
- MSL: Work around broken cube texture gradients on Apple Silicon.
Expand Down
2 changes: 1 addition & 1 deletion ExternalRevisions/SPIRV-Cross_repo_revision
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d9f4280f4511e9bff9bdd5147370b9ee49dbe2af
117161dd546075a568f0526bccffcd7e0bc96897
2 changes: 1 addition & 1 deletion ExternalRevisions/Vulkan-Headers_repo_revision
Original file line number Diff line number Diff line change
@@ -1 +1 @@
41263fc5aa994b8eafaca946583bfcceca8ca419
217e93c664ec6704ec2d8c36fa116c1a4a1e2d40
2 changes: 1 addition & 1 deletion ExternalRevisions/Vulkan-Tools_repo_revision
Original file line number Diff line number Diff line change
@@ -1 +1 @@
afb8b9e8caeade2489372b8cf78b70b5301c8741
2c0a644db855f40f100f9f39e5a8a8dfa2b0014d
2 changes: 1 addition & 1 deletion ExternalRevisions/glslang_repo_revision
Original file line number Diff line number Diff line change
@@ -1 +1 @@
719b6b7debbfe75bd427daa0e39c347fce16cf9a
a91631b260cba3f22858d6c6827511e636c2458a
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ else
OUTPUT_FMT_CMD = -quiet
endif

# Collect all variables defined on the command-line (eg: MVK_HIDE_VULKAN_SYMBOLS=1)
# Collect all build settings defined on the command-line (eg: MVK_HIDE_VULKAN_SYMBOLS=0, MVK_CONFIG_LOG_LEVEL=3...)
MAKEARGS := $(strip \
$(foreach v,$(.VARIABLES),\
$(if $(filter command\ line,$(origin $(v))),\
Expand Down
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,19 +295,23 @@ or
...etc.


### Hiding Vulkan API Symbols
### Exposing Static Vulkan API Symbols

You can optionally build MoltenVK with the Vulkan API static call symbols (`vk*`) hidden,
to avoid library linking conflicts when bound to a Vulkan Loader that also exports identical symbols.
For default compatability with the _Vulkan SDK_ loader environment, by default, **MoltenVK** hides
static access to the _Vulkan_ API symbols (`vk*`), in favor of using the standard _Vulkan_
function pointers retrieved using `vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`.

To do so, when building MoltenVK, set the build setting `MVK_HIDE_VULKAN_SYMBOLS=1`.
If you are not using the _Vulkan_ loader, and wish to statically link to the _Vulkan_ API symbols,
you can optionally build **MoltenVK** with the _Vulkan_ API static call symbols exposed.

To do so, when building **MoltenVK**, set the build setting `MVK_HIDE_VULKAN_SYMBOLS=0`.
This build setting can be set in the `MoltenVK.xcodeproj` *Xcode* project,
or it can be included in any of the `make` build commands. For example:

make MVK_HIDE_VULKAN_SYMBOLS=1
make MVK_HIDE_VULKAN_SYMBOLS=0
or

make macos MVK_HIDE_VULKAN_SYMBOLS=1
make macos MVK_HIDE_VULKAN_SYMBOLS=0

...etc.

Expand Down
Binary file modified Templates/spirv-tools/build.zip
Binary file not shown.

0 comments on commit b5774b3

Please sign in to comment.