From 39fa1d7031e3cca4cd61b0f283473348614e1bf9 Mon Sep 17 00:00:00 2001 From: scribam Date: Sun, 2 Jun 2019 09:44:05 +0200 Subject: [PATCH] ci/vk: Bump Vulkan version (1.1.73.0/1.1.97.0 => 1.1.106.0) VULKAN_SDK_MIRROR removed as the server is down --- .travis.yml | 10 ++++------ .travis/build-mac.bash | 2 +- README.md | 19 +++++++++++++++++++ appveyor.yml | 8 +++----- rpcs3/Emu/RSX/VK/VulkanAPI.h | 15 --------------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 739b2c62b9..a7e7dda131 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,21 +5,19 @@ matrix: # env: # - NAME="Linux build" # - COMPILER="gcc" -# dist: trusty # services: docker # cache: ccache -# install: "docker pull rpcs3/rpcs3-travis-trusty:1.0" -# script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' +# install: "docker pull rpcs3/rpcs3-travis-trusty:1.1" +# script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.1 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: linux env: - NAME="Linux build" - COMPILER="clang" - DEPLOY_APPIMAGE="true" - dist: trusty services: docker cache: ccache - install: "docker pull rpcs3/rpcs3-travis-trusty:1.0" - script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' + install: "docker pull rpcs3/rpcs3-travis-trusty:1.1" + script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.1 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: osx osx_image: xcode10.2 addons: diff --git a/.travis/build-mac.bash b/.travis/build-mac.bash index 8327d7de40..7de63b047a 100644 --- a/.travis/build-mac.bash +++ b/.travis/build-mac.bash @@ -5,7 +5,7 @@ export PATH="/usr/local/opt/ccache/libexec:$PATH" # Setup vulkan and gfx-rs/portability curl -sLO https://github.com/gfx-rs/portability/releases/download/latest/gfx-portability-macos-latest.zip unzip -: gfx-portability-macos-latest.zip -curl -sLO https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.97.0.zip +curl -sLO https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.106.0.zip unzip -: sdk-*.zip mkdir vulkan-sdk ln -s ${PWD}/Vulkan-Headers*/include vulkan-sdk/include diff --git a/README.md b/README.md index b36d29cedf..9dc06909ce 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,25 @@ You should also contact any of the developers in the forums or in the Discord se **If you have an NVIDIA GPU, you may need to install the libglvnd package.** +#### Vulkan-SDK + +For Ubuntu systems, it is strongly recommended to use the PPA from [LunarG](https://packages.lunarg.com/) which will provide a compatible Vulkan-SDK to compile RPCS3. If your Vulkan-SDK is older, it can lead to compilation errors. + +##### Ubuntu 18.04 (Bionic Beaver) +``` +wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - +sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.1.106-bionic.list http://packages.lunarg.com/vulkan/1.1.106/lunarg-vulkan-1.1.106-bionic.list +sudo apt update +sudo apt install vulkan-sdk +``` + +##### Ubuntu 16.04 (Xenial Xerus) +``` +wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - +sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.1.106-xenial.list http://packages.lunarg.com/vulkan/1.1.106/lunarg-vulkan-1.1.106-xenial.list +sudo apt update +sudo apt install vulkan-sdk +``` ## Building diff --git a/appveyor.yml b/appveyor.yml index d25a7eb3e4..466a85afde 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,9 @@ environment: LLVMLIBS: https://github.com/RPCS3/llvm/releases/download/continuous-master/llvmlibs.7z GLSLANG: https://dl.dropboxusercontent.com/s/ku2qgwmtfptzbvx/glslang.7z COMPATDB: https://rpcs3.net/compatibility?api=v1&export - VULKAN_SDK: "C:\\VulkanSDK\\1.1.73.0" - VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.1.73.0/windows/VulkanSDK-1.1.73.0-Installer.exe - VULKAN_SDK_MIRROR: https://nkmk.ch/rpcs3/VulkanSDK-1.1.73.0-Installer.exe - VULKAN_SDK_SHA: a5d193f97db4de97e6b4fdd81f00ff6a603f66bb17dc3cf8ac0fe9aec58497c7 + VULKAN_SDK: "C:\\VulkanSDK\\1.1.106.0" + VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.1.106.0/windows/VulkanSDK-1.1.106.0-Installer.exe + VULKAN_SDK_SHA: 24b5c9d415912c0fb07f973f10f671a488b0e33ca991409bcabf1d4bebf0b804 cache: - glslang.7z -> appveyor.yml @@ -69,7 +68,6 @@ build: before_build: - ps: | # initialize mirror arrays and fetch precompiled build dependencies $VULKAN_SDK_URLS = @( - $env:VULKAN_SDK_MIRROR; $env:VULKAN_SDK_URL; "$($env:VULKAN_SDK_URL)?Human=true"; ) diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h index a7b1503e0e..235f5061e3 100644 --- a/rpcs3/Emu/RSX/VK/VulkanAPI.h +++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h @@ -14,21 +14,6 @@ #include "define_new_memleakdetect.h" #include "Utilities/types.h" -// TODO: Remove when packages catch up, ubuntu is stuck at 1.1.73 (bionic) and 1.1.82 (cosmic) -// Do we still use libvulkan-dev package on travis?????? -#if VK_HEADER_VERSION < 95 - -typedef struct VkPhysicalDeviceFloat16Int8FeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderFloat16; - VkBool32 shaderInt8; -} VkPhysicalDeviceFloat16Int8FeaturesKHR; - -#define VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR VkStructureType(1000082000) - -#endif - namespace vk { void init();