emulators/rpcs3: update to 0.0.6.8314

Changes:	8e942eb50...43f919c04
This commit is contained in:
Jan Beich 2019-06-30 01:00:01 +00:00
parent 10e21b1d05
commit 9dc5785ed8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=505399
3 changed files with 56 additions and 16 deletions

View file

@ -2,13 +2,10 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.6-8275 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -g8e942eb50
DISTVERSION= 0.0.6-8314 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -g43f919c04
CATEGORIES= emulators
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 1e28a22860c0.patch:-p1 # Clang 7
MAINTAINER= jbeich@FreeBSD.org
COMMENT= PS3 emulator/debugger
@ -27,10 +24,10 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2
USE_GITHUB= yes
GH_ACCOUNT= RPCS3
GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \
RPCS3:llvm:99b528446302:llvm/llvm \
RPCS3:llvm:b860b5e8f4ee:llvm/llvm \
Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \
jbeder:yaml-cpp:yaml-cpp-0.6.2-23-geca9cfd:yamlcpp/3rdparty/yaml-cpp \
kobalicek:asmjit:1e550aa:asmjit/asmjit \
kobalicek:asmjit:fc251c9:asmjit/asmjit \
KhronosGroup:glslang:7.11.3214:glslang/Vulkan/glslang \
Microsoft:GSL:v2.0.0:GSL/3rdparty/GSL \
USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \

View file

@ -1,16 +1,16 @@
TIMESTAMP = 1561313338
SHA256 (RPCS3-rpcs3-v0.0.6-8275-g8e942eb50_GH0.tar.gz) = 75eb08e7f03aacb515b31a47b1845eb8e52312ec6c2444f670939d1205c53ac7
SIZE (RPCS3-rpcs3-v0.0.6-8275-g8e942eb50_GH0.tar.gz) = 5443398
TIMESTAMP = 1561823322
SHA256 (RPCS3-rpcs3-v0.0.6-8314-g43f919c04_GH0.tar.gz) = 4f47e0ea97790cdaf89055189b1783bc0d0ad9929d2279b13608b0a64b24804a
SIZE (RPCS3-rpcs3-v0.0.6-8314-g43f919c04_GH0.tar.gz) = 5450374
SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
SHA256 (RPCS3-llvm-99b528446302_GH0.tar.gz) = 36593a6f8dac6dd5d9eddab4b2aadcab768520a5b76f1cf7941f273609fcfa47
SIZE (RPCS3-llvm-99b528446302_GH0.tar.gz) = 47288210
SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e
SIZE (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = 47286737
SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95
SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521
SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0.tar.gz) = 554f6fac1d9524f807345f95ba9223332c644e56d7a7fdb2bcea1f5793b764fa
SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0.tar.gz) = 1397220
SHA256 (kobalicek-asmjit-1e550aa_GH0.tar.gz) = 89bdf974211da90940b0b58ea515234885aefc3b0af9385612d1c73da9bea4a2
SIZE (kobalicek-asmjit-1e550aa_GH0.tar.gz) = 446874
SHA256 (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 0fb6271fccf8ee86d27affda7e27a6d655bfabfda83a7dd0d41f7fd05b384aad
SIZE (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 446910
SHA256 (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = b30b4668734328d256e30c94037e60d3775b1055743c04d8fd709f2960f302a9
SIZE (KhronosGroup-glslang-7.11.3214_GH0.tar.gz) = 2841979
SHA256 (Microsoft-GSL-v2.0.0_GH0.tar.gz) = 6cce6fb16b651e62711a4f58e484931013c33979b795d1b1f7646f640cfa9c8e
@ -19,5 +19,3 @@ SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d9
SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883
SHA256 (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 37bed90f3dadb642acca41508391d1409a75af05f34f13da56c866d5c3c4b00d
SIZE (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 560956
SHA256 (1e28a22860c0.patch) = d3724271593ea91093e4adfcb98a4ada9741a9204961a3737f60461bdcf13393
SIZE (1e28a22860c0.patch) = 1052

View file

@ -0,0 +1,45 @@
In file included from rpcs3/Emu/RSX/VK/VKFormats.cpp:2:
In file included from rpcs3/Emu/RSX/VK/VKFormats.h:2:
rpcs3/Emu/RSX/VK/VKHelpers.h:465:3: error: unknown type name 'VkPhysicalDeviceDriverPropertiesKHR'; did you mean 'VkPhysicalDeviceGroupPropertiesKHR'?
VkPhysicalDeviceDriverPropertiesKHR driver_properties{};
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
VkPhysicalDeviceGroupPropertiesKHR
--- rpcs3/Emu/RSX/VK/VKHelpers.h.orig 2019-06-29 15:48:42 UTC
+++ rpcs3/Emu/RSX/VK/VKHelpers.h
@@ -47,6 +47,35 @@
#define FRAME_PRESENT_TIMEOUT 1000000ull // 1 second
#define GENERAL_WAIT_TIMEOUT 100000ull // 100ms
+#if VK_HEADER_VERSION < 92
+typedef enum VkDriverIdKHR {
+ VK_DRIVER_ID_AMD_PROPRIETARY_KHR = 1,
+ VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = 2,
+ VK_DRIVER_ID_MESA_RADV_KHR = 3,
+ VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR = 4,
+ VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS_KHR = 5,
+ VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR = 6,
+ VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR = 7,
+ VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR = 8,
+ VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9,
+ VK_DRIVER_ID_GOOGLE_SWIFTSHADER_KHR = 10,
+ VK_DRIVER_ID_GGP_PROPRIETARY_KHR = 11,
+ VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR = 12,
+ VK_DRIVER_ID_BEGIN_RANGE_KHR = VK_DRIVER_ID_AMD_PROPRIETARY_KHR,
+ VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR,
+ VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR - VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
+ VK_DRIVER_ID_MAX_ENUM_KHR = 0x7FFFFFFF
+} VkDriverIdKHR;
+typedef struct VkPhysicalDeviceDriverPropertiesKHR {
+ VkStructureType sType;
+ void* pNext;
+ VkDriverIdKHR driverID;
+ char driverName[VK_MAX_DRIVER_NAME_SIZE_KHR];
+ char driverInfo[VK_MAX_DRIVER_INFO_SIZE_KHR];
+ VkConformanceVersionKHR conformanceVersion;
+} VkPhysicalDeviceDriverPropertiesKHR;
+#endif
+
namespace rsx
{
class fragment_texture;