Skip to content

Commit 9f7b1f9

Browse files
Updated submodules (fixed Vk build issues on Apple)
1 parent 6c6c074 commit 9f7b1f9

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

.github/workflows/build-apple.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
precheks:
7-
runs-on: macos-latest
7+
runs-on: macos-12
88
name: MacOS -> Pre-Checks
99

1010
steps:
@@ -36,7 +36,7 @@ jobs:
3636

3737
build:
3838
needs: precheks
39-
runs-on: macos-latest
39+
runs-on: macos-12
4040

4141
strategy:
4242
matrix:

DiligentFX

DiligentSamples

DiligentTools

README.md

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ By default, applications will run in OpenGLES mode. To run them in Vulkan mode,
318318

319319
Prerequisites:
320320

321-
* Xcode 13 or later
322-
* Vulkan SDK 1.3.216.0 or later to enable Vulkan
321+
* Xcode 14 or later
322+
* Vulkan SDK 1.3.231.1 or later to enable Vulkan
323323

324324
After you clone the repo, run the following command from the engine's root folder to generate Xcode project:
325325

@@ -343,10 +343,10 @@ or [gfx-portability](https://github.com/gfx-rs/portability). Install [VulkanSDK]
343343
and make sure that your system is properly configured as described
344344
[here](https://vulkan.lunarg.com/doc/view/latest/mac/getting_started.html#user-content-sdk-system-paths).
345345
In particular, you may need to define the following environment variables (assuming that Vulkan SDK is installed at
346-
`/Users/MyName/VulkanSDK/1.3.216.0` and you want to use MoltenVK):
346+
`/Users/MyName/VulkanSDK/1.3.231.1` and you want to use MoltenVK):
347347

348348
```
349-
export VULKAN_SDK=/Users/MyName/VulkanSDK/1.3.216.0/macOS
349+
export VULKAN_SDK=/Users/MyName/VulkanSDK/1.3.231.1/macOS
350350
export PATH=$VULKAN_SDK/bin:$PATH
351351
export DYLD_LIBRARY_PATH=$VULKAN_SDK/lib:$DYLD_LIBRARY_PATH
352352
export VK_ICD_FILENAMES=$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json
@@ -370,15 +370,15 @@ System Integrity Protection is disabled (which generally is not recommended). In
370370
Vulkan library, it must be in rpath. If `VULKAN_SDK` environment variable is set and points to correct location, Diligent
371371
Engine will configure the rpath for all applications automatically.
372372

373-
Last tested Vulkan SDK version: 1.3.216.0.
373+
Last tested Vulkan SDK version: 1.3.231.1.
374374

375375
<a name="build_and_run_ios"></a>
376376
## iOS
377377

378378
Prerequisites:
379379

380-
* Xcode 13 or later
381-
* Vulkan SDK 1.3.216.0 or later to enable Vulkan
380+
* Xcode 14 or later
381+
* Vulkan SDK 1.3.231.1 or later to enable Vulkan
382382

383383
Run the command below from the engine's root folder to generate Xcode project configured for
384384
[iOS build](https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-or-watchos):
@@ -393,6 +393,13 @@ If needed, you can provide iOS deployment target (11.0 or later is required) as
393393
cmake -S . -B ./build/iOS -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -G "Xcode"
394394
```
395395

396+
:warning: To build for iPhone simulator, set the `PLATFORM_IOS_SIMULATOR` CMake flag. You may also use the
397+
`CMAKE_OSX_ARCHITECTURES` variable to specify target architecture, for example:
398+
399+
```cmake
400+
cmake -S . -B ./build/iOSSim -DCMAKE_SYSTEM_NAME=iOS -DPLATFORM_IOS_SIMULATOR=ON -DCMAKE_OSX_ARCHITECTURES=arm64 -G "Xcode"
401+
```
402+
396403
Open Xcode project file in `build/IOS` folder and build the engine. To run the applications on an iOS device,
397404
you will need to set appropriate development team in the project settings.
398405

@@ -402,10 +409,10 @@ To enable Vulkan on iOS, download and install the [VulkanSDK](https://vulkan.lun
402409
on iOS, and Diligent Engine links directly with MoltenVK XCFramework (see
403410
[MoltenVk install guide](https://github.com/KhronosGroup/MoltenVK/blob/master/Docs/MoltenVK_Runtime_UserGuide.md#install-moltenvk-as-a-universal-xcframework))
404411
that implements Vulkan on Metal. To enable Vulkan in Diligent Engine on iOS, specify the path to Vulkan SDK
405-
when running CMake, for example (assuming that Vulkan SDK is installed at `/Users/MyName/VulkanSDK/1.3.216.0`):
412+
when running CMake, for example (assuming that Vulkan SDK is installed at `/Users/MyName/VulkanSDK/1.3.231.1`):
406413

407414
```cmake
408-
cmake -DCMAKE_SYSTEM_NAME=iOS -DVULKAN_SDK=/Users/MyName/VulkanSDK/1.3.216.0 -S . -B ./build/iOS -G "Xcode"
415+
cmake -DCMAKE_SYSTEM_NAME=iOS -DVULKAN_SDK=/Users/MyName/VulkanSDK/1.3.231.1 -S . -B ./build/iOS -G "Xcode"
409416
```
410417

411418
By default, the engine links with MoltenVK XCFramework located in Vulkan SDK. If this is not desired or an application wants
@@ -414,7 +421,7 @@ to use a specific library, it can provide the full path to the library via `MOLT
414421
Refer to [MoltenVK user guide](https://github.com/KhronosGroup/MoltenVK/blob/master/Docs/MoltenVK_Runtime_UserGuide.md#install)
415422
for more information about MoltenVK installation and usage.
416423

417-
Last tested Vulkan SDK version: 1.3.216.0.
424+
Last tested Vulkan SDK version: 1.3.231.1.
418425

419426
<a name="build_and_run_emscripten"></a>
420427
## Emscripten

0 commit comments

Comments
 (0)