Skip to content

Commit

Permalink
Merge pull request #2095 from billhollings/VK_EXT_layer_settings
Browse files Browse the repository at this point in the history
Add support for VK_EXT_layer_settings extension
  • Loading branch information
billhollings authored Dec 19, 2023
2 parents 9fbf8a1 + 6daa6c0 commit 76233bc
Show file tree
Hide file tree
Showing 42 changed files with 1,662 additions and 1,587 deletions.
7 changes: 5 additions & 2 deletions Common/MVKCommonEnvironment.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ extern "C" {
* Compiler build setting that ensures a definite value for whether this
* build is a debug build or not.
*
* If the standard DEBUG build setting is defined, MVK_DEBUG is set to true,
* otherwise, it is set to false.
* If the standard DEBUG build setting is defined, MVK_CONFIG_DEBUG is
* set to true, otherwise, it is set to false.
*/
#ifndef MVK_DEBUG
# ifdef DEBUG
Expand All @@ -41,6 +41,9 @@ extern "C" {
# define MVK_DEBUG 0
# endif
#endif
#ifndef MVK_CONFIG_DEBUG
# define MVK_CONFIG_DEBUG MVK_DEBUG
#endif

/** Building for macOS. */
#ifndef MVK_MACOS
Expand Down
12 changes: 6 additions & 6 deletions Demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ Table of Contents
*Cube*
------

The basic canonical *Cube* sample app from the
[*Vulkan-Tools* repository](https://github.com/KhronosGroup/Vulkan-Tools)
The basic canonical *Cube* sample app from the
[*Vulkan-Tools* repository](https://github.com/KhronosGroup/Vulkan-Tools)
is included in this **MoltenVK** package.

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
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.

To run this demo, run the `Cube-iOS`, `Cube-tvOS`, or `Cube-macOS` *Scheme* from within *Xcode*.
To run this demo, run the `Cube-iOS`, `Cube-tvOS`, or `Cube-macOS` *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
The `Cube` demo is a simple example of installing **MoltenVK** as an `XCFramework` that is
statically linked to the application. It supports all platforms, including _Mac Catalyst_, _iOS
Simulator_ and _tvOS Simulator_, and all architectures including _Apple Silicon_.

Expand All @@ -46,5 +46,5 @@ Simulator_ and _tvOS Simulator_, and all architectures including _Apple Silicon_
*Khronos Vulkan Samples*
----------------------

*Khronos Group* provides a [repository](https://github.com/KhronosGroup/Vulkan-Samples)
*Khronos Group* provides a [repository](https://github.com/KhronosGroup/Vulkan-Samples)
containing a full suite of standard *Vulkan* samples that run on **MoltenVK** on *macOS*.
Loading

0 comments on commit 76233bc

Please sign in to comment.