summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-07-04 20:24:59 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-07-04 20:24:59 +0000
commit45a354eba33eb8e56fdfeb787800d42e42281a6b (patch)
treefbfb665f30fb623a92c4c8b5c072a27672bfbd33 /emulators
parentdevel/hs-git-annex: Update to 7.20190626. Update its dependency net/hs-networ... (diff)
devel/vulkan-*: update to 1.1.108
- Force rebuild all consumers to catch regressions early Changes: https://github.com/KhronosGroup/glslang/compare/7.10.2984...7.11.3214 Changes: https://github.com/KhronosGroup/SPIRV-Headers/compare/4618b86...c4f8f65 Changes: https://github.com/KhronosGroup/SPIRV-Tools/compare/v2018.6...v2019.2 Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/sdk-1.1.82.0...sdk-1.1.108.0 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/sdk-1.1.82.0...sdk-1.1.108.0 Changes: https://github.com/KhronosGroup/Vulkan-Tools/compare/sdk-1.1.82.0...sdk-1.1.108.0 Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/sdk-1.1.82.0...sdk-1.1.108.0 PR: 238945 Submitted by: Greg V (maintainer)
Notes
Notes: svn path=/head/; revision=505867
Diffstat (limited to 'emulators')
-rw-r--r--emulators/rpcs3/Makefile1
-rw-r--r--emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h58
-rw-r--r--emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h31
3 files changed, 1 insertions, 89 deletions
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 6baa6bf77d86..37107b318ef4 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -4,6 +4,7 @@ PORTNAME= rpcs3
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.6-8329 # git rev-list --count HEAD
DISTVERSIONSUFFIX= -gad10eb391
+PORTREVISION= 1
CATEGORIES= emulators
MAINTAINER= jbeich@FreeBSD.org
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h
deleted file mode 100644
index f1ed0e33d8ad..000000000000
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VKHelpers.h
+++ /dev/null
@@ -1,58 +0,0 @@
-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,48 @@
- #define FRAME_PRESENT_TIMEOUT 1000000ull // 1 second
- #define GENERAL_WAIT_TIMEOUT 100000ull // 100ms
-
-+#if VK_HEADER_VERSION < 92
-+#define VK_MAX_DRIVER_NAME_SIZE_KHR 256
-+#define VK_MAX_DRIVER_INFO_SIZE_KHR 256
-+
-+#define VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR (VkStructureType)1000196000
-+
-+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 VkConformanceVersionKHR {
-+ uint8_t major;
-+ uint8_t minor;
-+ uint8_t subminor;
-+ uint8_t patch;
-+} VkConformanceVersionKHR;
-+
-+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;
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h b/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h
deleted file mode 100644
index 808a84bb690d..000000000000
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_RSX_VK_VulkanAPI.h
+++ /dev/null
@@ -1,31 +0,0 @@
-Revert https://github.com/RPCS3/rpcs3/commit/39fa1d7031e3 to unbreak
-with devel/vulkan-headers < 1.1.96
-
-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:603:5: error: unknown type name 'VkPhysicalDeviceFloat16Int8FeaturesKHR'; did you mean 'VkPhysicalDeviceMultiviewFeaturesKHR'?
- VkPhysicalDeviceFloat16Int8FeaturesKHR shader_support_info{};
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
---- rpcs3/Emu/RSX/VK/VulkanAPI.h.orig 2019-06-10 11:57:03 UTC
-+++ rpcs3/Emu/RSX/VK/VulkanAPI.h
-@@ -14,6 +14,19 @@
- #include "define_new_memleakdetect.h"
- #include "Utilities/types.h"
-
-+#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();