Skip to content

Commit 0cc4c93

Browse files
RaelrRaelr
committed
Updated bash file with new vulkan version
1 parent 4167875 commit 0cc4c93

File tree

6 files changed

+104
-56
lines changed

6 files changed

+104
-56
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@
4343
[submodule "vendor/freetype"]
4444
path = vendor/freetype
4545
url = https://github.com/freetype/freetype.git
46+
[submodule "vendor/vulkan/Vulkan-Utility-Libraries"]
47+
path = vendor/vulkan/Vulkan-Utility-Libraries
48+
url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git

‎scripts/packagelibs.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ param( [String] $LibSourceDir, [String] $LibDestDir )
1010

1111
robocopy $LibSourceDir $LibDestDir /e /im /is /it
1212

13-
if (Test-Path -Path "$LibDestDir/lib/*.dll")
13+
if (Test-Path -Path "$LibSourceDir/lib/*.dll")
1414
{
1515
robocopy $LibDestDir/lib LibDestDir *.dll /mov /im /is /it
1616
}

‎scripts/setup.ps1‎

Lines changed: 63 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ function Setup-Glslang {
165165
$CMAKE_COMPILER `
166166
-DBUILD_EXTERNAL=OFF `
167167
-DCMAKE_INSTALL_PREFIX="$build_dir" `
168-
-DCMAKE_BUILD_TYPE=Release `
168+
-DCMAKE_BUILD_TYPE=Release ` `
169+
-DSPIRV-Tools-opt_INCLUDE_DIRS="$Vulkan_Vendor_Dir\SPIRV-Tools\build\install\include" `
170+
-DALLOW_EXTERNAL_SPIRV_TOOLS=1 `
169171
-S"$Vendor_Dir/glslang" `
170172
-B"$build_dir"
171173

@@ -201,11 +203,11 @@ function Setup-Vulkan-Headers {
201203
-B"$build_dir" `
202204
-S"$Vulkan_Vendor_Dir/Vulkan-Headers"
203205

204-
cmake --install "$build_dir" --prefix "$build_dir"
206+
cmake --build "$build_dir" --target install
205207

206208
Make-Dir $Vulkan_Include_Dir
207209

208-
Get-ChildItem "$Vulkan_Vendor_Dir/Vulkan-Headers/build/include" | Copy-Item -Destination $Vulkan_Include_Dir -Recurse
210+
Get-ChildItem "$Vulkan_Vendor_Dir/Vulkan-Headers/build/install/include" | Copy-Item -Destination $Vulkan_Include_Dir -Recurse -Force
209211
}
210212

211213
function Setup-Vulkan-Loader {
@@ -220,16 +222,17 @@ function Setup-Vulkan-Loader {
220222

221223
cmake `
222224
$CMAKE_COMPILER `
225+
-G "$Generator" `
223226
-DCMAKE_INSTALL_PREFIX="$build_dir" `
224-
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build" `
227+
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build/install" `
225228
-S"$Vulkan_Vendor_Dir/Vulkan-Loader" `
226229
-B"$build_dir"
227230

228-
cmake --build "$build_dir" --parallel $env:NUMBER_OF_PROCESSORS --config Release
231+
cmake --build "$build_dir" --parallel $env:NUMBER_OF_PROCESSORS
229232

230233
Make-Dir $Vulkan_Lib_Dir
231234

232-
Copy-Item -Path "$build_dir/loader/Release/*" -Destination $Vulkan_Lib_Dir -Include "*.dll" -Recurse
235+
Copy-Item -Path "$build_dir/loader/*" -Destination "$Vulkan_Lib_Dir" -Include "*.dll" -Recurse
233236
}
234237

235238
function Setup-Robin-Hood-Hashing {
@@ -292,23 +295,38 @@ function Setup-Spirv-Tools {
292295
-DCMAKE_BUILD_TYPE=Release `
293296
-DSPIRV_SKIP_TESTS=ON `
294297
-DSPIRV_WERROR=OFF `
295-
-DSPIRV-Headers_SOURCE_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers" `
296-
-DCMAKE_INSTALL_PREFIX="$build_dir\install" `
297-
-S"$Vulkan_Vendor_Dir\SPIRV-Tools" `
298+
-DSPIRV-Headers_SOURCE_DIR="$Vulkan_Vendor_Dir\\SPIRV-Headers" `
299+
-DCMAKE_INSTALL_PREFIX="$build_dir\\install" `
300+
-S"$Vulkan_Vendor_Dir\\SPIRV-Tools" `
298301
-B"$build_dir"
299302

300-
cmake `
301-
$CMAKE_COMPILER `
302-
-DCMAKE_BUILD_TYPE=Release `
303-
-DSPIRV_SKIP_TESTS=ON `
304-
-DSPIRV_WERROR=OFF `
305-
-DSPIRV-Headers_SOURCE_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers" `
306-
-DCMAKE_INSTALL_PREFIX="$build_dir\install" `
307-
-S"$Vulkan_Vendor_Dir\SPIRV-Tools" `
308-
-B"$build_dir"
309303
cmake --build $build_dir --parallel $env:NUMBER_OF_PROCESSORS --target install --config Release
310304
}
311305

306+
function Setup-Vulkan-Utility-Libraries
307+
{
308+
Write-Output "Setting up Vulkan Utility Libraries..."
309+
Write-Output "Cloning Vulkan Utility Libraries..."
310+
311+
Update-Submodule vulkan\Vulkan-Utility-Libraries
312+
313+
Checkout-Tags "$Vulkan_Vendor_Dir\Vulkan-Utility-Libraries" "$Vulkan_Version"
314+
315+
Write-Output "Building Vulkan Validation Layers..."
316+
[string] $build_dir = "$Vulkan_Vendor_Dir\Vulkan-Utility-Libraries/build"
317+
318+
cmake `
319+
$CMAKE_COMPILER `
320+
-S "${Vulkan_Vendor_Dir}\Vulkan-Utility-Libraries" `
321+
-B "$build_dir" `
322+
-DCMAKE_BUILD_TYPE=Release `
323+
-DUPDATE_DEPS=OFF `
324+
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir\Vulkan-Headers\build\install" `
325+
-DCMAKE_INSTALL_PREFIX="$build_dir\install"
326+
327+
cmake --build $build_dir --target install --config Release --parallel $env:NUMBER_OF_PROCESSORS
328+
}
329+
312330
function Setup-Validation-Layers {
313331
Write-Output "Setting up Vulkan Validation Layers..."
314332
Write-Output "Cloning Vulkan ValidationLayers..."
@@ -321,16 +339,17 @@ function Setup-Validation-Layers {
321339

322340
Make-Dir $build_dir
323341

324-
cmake `
325-
$CMAKE_COMPILER `
326-
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build" `
327-
-DGLSLANG_INSTALL_DIR="$Vulkan_Vendor_Dir/glslang/build" `
328-
-DSPIRV_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers/build/install" `
329-
-DSPIRV_TOOLS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Tools/build/install" `
330-
-DROBIN_HOOD_HASHING_INSTALL_DIR="$Vulkan_Vendor_Dir/robin-hood-hashing/build/install" `
331-
-DCMAKE_INSTALL_PREFIX="$build_dir" `
332-
-DBUILD_TESTS=OFF `
333-
-S"$Vulkan_Vendor_Dir/Vulkan-ValidationLayers" `
342+
cmake `
343+
$CMAKE_COMPILER `
344+
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build/install" `
345+
-DGLSLANG_INSTALL_DIR="$Vulkan_Vendor_Dir/glslang/build" `
346+
-DSPIRV_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers/build/install" `
347+
-DSPIRV_TOOLS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Tools/build/install" `
348+
-DROBIN_HOOD_HASHING_INSTALL_DIR="$Vulkan_Vendor_Dir/robin-hood-hashing/build/install" `
349+
-DVULKAN_UTILITY_LIBRARIES_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Utility-Libraries/build/install" `
350+
-DCMAKE_INSTALL_PREFIX="$build_dir" `
351+
-DBUILD_TESTS=OFF `
352+
-S"$Vulkan_Vendor_Dir/Vulkan-ValidationLayers" `
334353
-B"$build_dir"
335354

336355
cmake --build $build_dir --parallel $env:NUMBER_OF_PROCESSORS --target install --config Release
@@ -347,26 +366,27 @@ if (Test-Path "$Vulkan_Lib_Dir") { Remove-Item -Path "$Vulkan_Lib_Dir" -Recurse
347366
if (Test-Path "$Vulkan_Vendor_Dir/vulkan/include") { Remove-Item -Path "$Vulkan_Vendor_Dir/vulkan/include" -Recurse -Force }
348367
if (Test-Path "$Vendor_Dir/include") { Remove-Item -Path "$Vendor_Dir/include" -Recurse -Force }
349368

350-
#Setup-Utest
351-
#Setup-Zlib
352-
#Setup-LibPng
353-
#Setup-FreeType
354-
#Setup-Glfw
355-
#Setup-Spirv-Headers
356-
#Setup-Spirv-Tools
357-
#Setup-Glslang
358-
#Setup-Volk
359-
#Setup-Vulkan-Headers
360-
#Setup-Vulkan-Loader
369+
Setup-Utest
370+
Setup-Zlib
371+
Setup-LibPng
372+
Setup-FreeType
373+
Setup-Glfw
374+
Setup-Vulkan-Headers
375+
Setup-Spirv-Headers
376+
Setup-Spirv-Tools
377+
Setup-Glslang
378+
Setup-Volk
379+
Setup-Vulkan-Loader
361380

362381
if ($Include_Validation_Layers)
363382
{
364-
#Setup-Robin-Hood-Hashing
383+
Setup-Robin-Hood-Hashing
384+
Setup-Vulkan-Utility-Libraries
365385
Setup-Validation-Layers
366386

367-
#Write-Output "Configuring environment file..."
368-
#if (!(Test-Path "$Root_Dir/.env")) { New-Item -Path "$Root_Dir/.env" -ItemType file }
369-
#Set-Content -Path "$Root_Dir/.env" -Value "VK_LAYER_PATH=$Bin_Dir\examples\render\build\lib\explicit_layer.d"
387+
Write-Output "Configuring environment file..."
388+
if (!(Test-Path "$Root_Dir/.env")) { New-Item -Path "$Root_Dir/.env" -ItemType file }
389+
Set-Content -Path "$Root_Dir/.env" -Value "VK_LAYER_PATH=$Bin_Dir\examples\render\build\lib\explicit_layer.d"
370390
}
371391

372392
Write-Output "Siege setup complete"

‎scripts/setup.sh‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ update_submodules() {
4545
}
4646

4747
checkout_tags() {
48-
git -C "$1" fetch --all --tags ; git -C "$1" checkout tags/"$2"
48+
git -C "$1" fetch --all --tags --force ; git -C "$1" checkout tags/"$2"
4949
}
5050

5151
setup_utest() {
@@ -78,8 +78,13 @@ setup_glslang() {
7878
-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"/glslang/build \
7979
-G "${GENERATOR}" -DCMAKE_BUILD_TYPE=Release \
8080
-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"/glslang/build/install \
81+
-DALLOW_EXTERNAL_SPIRV_TOOLS=1 \
82+
-DSPIRV-Tools-opt_INCLUDE_DIRS="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build/install/include \
8183
-S"${VENDOR_DIR}"/glslang \
8284
-B"${VENDOR_DIR}"/glslang/build
85+
86+
ln -sfn "${VULKAN_VENDOR_DIR}"/SPIRV-Tools "${VENDOR_DIR}"/glslang/External/spirv-tools
87+
8388
cmake --build "${VENDOR_DIR}"/glslang/build --target install -- -j"${NUMBER_OF_PROCESSORS}"
8489
}
8590

@@ -141,7 +146,7 @@ setup_moltenVk() {
141146
checkout_tags "${VULKAN_VENDOR_DIR}"/MoltenVK ${MOLTENVK_VERSION}
142147

143148
echo "Building MoltenVk..."
144-
(cd "${VULKAN_VENDOR_DIR}"/MoltenVK ; ./fetchDependencies --macos --v-headers-root "${VULKAN_VENDOR_DIR}"/Vulkan-Headers)
149+
(cd "${VULKAN_VENDOR_DIR}"/MoltenVK ; ./fetchDependencies --macos --v-headers-root "${VULKAN_VENDOR_DIR}"/Vulkan-Headers --glslang-root "${VENDOR_DIR}"/glslang)
145150
make -C "${VULKAN_VENDOR_DIR}"/MoltenVK macos -j"${NUMBER_OF_PROCESSORS}"
146151
mkdir -p "${VULKAN_LIB_DIR}"/icd.d
147152
mkdir -p "${VULKAN_INCLUDE_DIR}"
@@ -191,6 +196,23 @@ setup_spirv_tools() {
191196
mkdir -p "${BUILD_DIR}"
192197
cmake -DCMAKE_BUILD_TYPE=Release -DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR="${VULKAN_VENDOR_DIR}/SPIRV-Headers" -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}"/install -S"${VULKAN_VENDOR_DIR}"/SPIRV-Tools -B"${BUILD_DIR}"
193198
cmake --build "${BUILD_DIR}" --target install --config Release -j"${NUMBER_OF_PROCESSORS}"
199+
200+
ln -sfn "${VULKAN_VENDOR_DIR}"/SPIRV-Headers "${VULKAN_VENDOR_DIR}"/SPIRV-Tools/external/spirv-headers
201+
}
202+
203+
setup_vulkan_utility_libraries() {
204+
echo "Setting up Vulkan Utility Libraries..."
205+
echo "Cloning Vulkan Utility Libraries..."
206+
207+
update_submodules vulkan/Vulkan-Utility-Libraries
208+
checkout_tags "${VULKAN_VENDOR_DIR}"/Vulkan-Utility-Libraries "$VULKAN_VERSION"
209+
210+
echo "Building Vulkan Utility Libraries..."
211+
local BUILD_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Utility-Libraries/build
212+
mkdir -p "${BUILD_DIR}"
213+
214+
cmake -S "${VULKAN_VENDOR_DIR}"/Vulkan-Utility-Libraries -B "${BUILD_DIR}" -DCMAKE_BUILD_TYPE=Release -DUPDATE_DEPS=OFF -DVULKAN_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Headers/build/install -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}"/install
215+
cmake --build "${BUILD_DIR}" --target install --config Release -j"${NUMBER_OF_PROCESSORS}"
194216
}
195217

196218
setup_validation_layers() {
@@ -203,15 +225,16 @@ setup_validation_layers() {
203225
local BUILD_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-ValidationLayers/build
204226
mkdir -p "${BUILD_DIR}"
205227
cmake \
206-
-DVULKAN_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Headers/build/install \
207-
-DGLSLANG_INSTALL_DIR="${VENDOR_DIR}"/glslang/build/install \
208-
-DSPIRV_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Headers/build/install \
209-
-DSPIRV_TOOLS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build/install \
210-
-DROBIN_HOOD_HASHING_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/robin-hood-hashing/build/install \
211-
-DCMAKE_BUILD_TYPE=Release \
212-
-DCMAKE_INSTALL_PREFIX="${BUILD_DIR}" \
213-
-DBUILD_TESTS=OFF \
214-
-S"${VULKAN_VENDOR_DIR}"/Vulkan-ValidationLayers \
228+
-DVULKAN_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Headers/build/install \
229+
-DGLSLANG_INSTALL_DIR="${VENDOR_DIR}"/glslang/build/install \
230+
-DSPIRV_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Headers/build/install \
231+
-DSPIRV_TOOLS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build/install \
232+
-DROBIN_HOOD_HASHING_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/robin-hood-hashing/build/install \
233+
-DVULKAN_UTILITY_LIBRARIES_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Utility-Libraries/build/install \
234+
-DCMAKE_BUILD_TYPE=Release \
235+
-DCMAKE_INSTALL_PREFIX="${BUILD_DIR}" \
236+
-DBUILD_TESTS=OFF \
237+
-S"${VULKAN_VENDOR_DIR}"/Vulkan-ValidationLayers \
215238
-B"${BUILD_DIR}"
216239
cmake --build "${BUILD_DIR}" --config Release --target install -j"${NUMBER_OF_PROCESSORS}"
217240
mkdir -p "${VULKAN_LIB_DIR}"/explicit_layer.d
@@ -278,6 +301,7 @@ fi
278301

279302
if [[ $* == *--include-validation-layers* ]]; then
280303
setup_robin_hood_hashing
304+
setup_vulkan_utility_libraries
281305
setup_validation_layers
282306
fi
283307

‎vendor/vulkan/MoltenVK‎

Submodule MoltenVK updated 239 files

‎vendor/vulkan/Vulkan-Utility-Libraries‎

0 commit comments

Comments
 (0)