summaryrefslogtreecommitdiff
path: root/src/video_core/vulkan_common
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/vulkan_common')
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp2
-rw-r--r--src/video_core/vulkan_common/vulkan_device.h8
-rw-r--r--src/video_core/vulkan_common/vulkan_wrapper.h14
3 files changed, 12 insertions, 12 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 48f1a3d14..df348af55 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -417,7 +417,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
417 417
418 sets_per_pool = 64; 418 sets_per_pool = 64;
419 if (is_amd_driver) { 419 if (is_amd_driver) {
420 // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2. 420 // AMD drivers need a higher amount of Sets per Pool in certain circumstances like in XC2.
421 sets_per_pool = 96; 421 sets_per_pool = 96;
422 // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken. 422 // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken.
423 if (!features.shader_float16_int8.shaderFloat16) { 423 if (!features.shader_float16_int8.shaderFloat16) {
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h
index 0662a2d9f..41b5da18a 100644
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -180,7 +180,7 @@ public:
180 ~Device(); 180 ~Device();
181 181
182 /** 182 /**
183 * Returns a format supported by the device for the passed requeriments. 183 * Returns a format supported by the device for the passed requirements.
184 * @param wanted_format The ideal format to be returned. It may not be the returned format. 184 * @param wanted_format The ideal format to be returned. It may not be the returned format.
185 * @param wanted_usage The usage that must be fulfilled even if the format is not supported. 185 * @param wanted_usage The usage that must be fulfilled even if the format is not supported.
186 * @param format_type Format type usage. 186 * @param format_type Format type usage.
@@ -259,12 +259,12 @@ public:
259 259
260 bool ShouldBoostClocks() const; 260 bool ShouldBoostClocks() const;
261 261
262 /// Returns uniform buffer alignment requeriment. 262 /// Returns uniform buffer alignment requirement.
263 VkDeviceSize GetUniformBufferAlignment() const { 263 VkDeviceSize GetUniformBufferAlignment() const {
264 return properties.properties.limits.minUniformBufferOffsetAlignment; 264 return properties.properties.limits.minUniformBufferOffsetAlignment;
265 } 265 }
266 266
267 /// Returns storage alignment requeriment. 267 /// Returns storage alignment requirement.
268 VkDeviceSize GetStorageBufferAlignment() const { 268 VkDeviceSize GetStorageBufferAlignment() const {
269 return properties.properties.limits.minStorageBufferOffsetAlignment; 269 return properties.properties.limits.minStorageBufferOffsetAlignment;
270 } 270 }
@@ -656,7 +656,7 @@ private:
656 bool is_integrated{}; ///< Is GPU an iGPU. 656 bool is_integrated{}; ///< Is GPU an iGPU.
657 bool is_virtual{}; ///< Is GPU a virtual GPU. 657 bool is_virtual{}; ///< Is GPU a virtual GPU.
658 bool is_non_gpu{}; ///< Is SoftwareRasterizer, FPGA, non-GPU device. 658 bool is_non_gpu{}; ///< Is SoftwareRasterizer, FPGA, non-GPU device.
659 bool has_broken_cube_compatibility{}; ///< Has broken cube compatiblity bit 659 bool has_broken_cube_compatibility{}; ///< Has broken cube compatibility bit
660 bool has_renderdoc{}; ///< Has RenderDoc attached 660 bool has_renderdoc{}; ///< Has RenderDoc attached
661 bool has_nsight_graphics{}; ///< Has Nsight Graphics attached 661 bool has_nsight_graphics{}; ///< Has Nsight Graphics attached
662 bool supports_d24_depth{}; ///< Supports D24 depth buffers. 662 bool supports_d24_depth{}; ///< Supports D24 depth buffers.
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h
index e86f661cb..4ff328a21 100644
--- a/src/video_core/vulkan_common/vulkan_wrapper.h
+++ b/src/video_core/vulkan_common/vulkan_wrapper.h
@@ -68,7 +68,7 @@ public:
68 constexpr Span(const Range& range) : ptr{std::data(range)}, num{std::size(range)} {} 68 constexpr Span(const Range& range) : ptr{std::data(range)}, num{std::size(range)} {}
69 69
70 /// Construct a span from a pointer and a size. 70 /// Construct a span from a pointer and a size.
71 /// This is inteded for subranges. 71 /// This is intended for subranges.
72 constexpr Span(const T* ptr_, std::size_t num_) noexcept : ptr{ptr_}, num{num_} {} 72 constexpr Span(const T* ptr_, std::size_t num_) noexcept : ptr{ptr_}, num{num_} {}
73 73
74 /// Returns the data pointer by the span. 74 /// Returns the data pointer by the span.
@@ -390,11 +390,11 @@ public:
390 Handle(const Handle&) = delete; 390 Handle(const Handle&) = delete;
391 Handle& operator=(const Handle&) = delete; 391 Handle& operator=(const Handle&) = delete;
392 392
393 /// Construct a handle transfering the ownership from another handle. 393 /// Construct a handle transferring the ownership from another handle.
394 Handle(Handle&& rhs) noexcept 394 Handle(Handle&& rhs) noexcept
395 : handle{std::exchange(rhs.handle, nullptr)}, owner{rhs.owner}, dld{rhs.dld} {} 395 : handle{std::exchange(rhs.handle, nullptr)}, owner{rhs.owner}, dld{rhs.dld} {}
396 396
397 /// Assign the current handle transfering the ownership from another handle. 397 /// Assign the current handle transferring the ownership from another handle.
398 /// Destroys any previously held object. 398 /// Destroys any previously held object.
399 Handle& operator=(Handle&& rhs) noexcept { 399 Handle& operator=(Handle&& rhs) noexcept {
400 Release(); 400 Release();
@@ -463,10 +463,10 @@ public:
463 Handle(const Handle&) = delete; 463 Handle(const Handle&) = delete;
464 Handle& operator=(const Handle&) = delete; 464 Handle& operator=(const Handle&) = delete;
465 465
466 /// Construct a handle transfering ownership from another handle. 466 /// Construct a handle transferring ownership from another handle.
467 Handle(Handle&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)}, dld{rhs.dld} {} 467 Handle(Handle&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)}, dld{rhs.dld} {}
468 468
469 /// Assign the current handle transfering the ownership from another handle. 469 /// Assign the current handle transferring the ownership from another handle.
470 /// Destroys any previously held object. 470 /// Destroys any previously held object.
471 Handle& operator=(Handle&& rhs) noexcept { 471 Handle& operator=(Handle&& rhs) noexcept {
472 Release(); 472 Release();
@@ -533,12 +533,12 @@ public:
533 PoolAllocations(const PoolAllocations&) = delete; 533 PoolAllocations(const PoolAllocations&) = delete;
534 PoolAllocations& operator=(const PoolAllocations&) = delete; 534 PoolAllocations& operator=(const PoolAllocations&) = delete;
535 535
536 /// Construct an allocation transfering ownership from another allocation. 536 /// Construct an allocation transferring ownership from another allocation.
537 PoolAllocations(PoolAllocations&& rhs) noexcept 537 PoolAllocations(PoolAllocations&& rhs) noexcept
538 : allocations{std::move(rhs.allocations)}, num{rhs.num}, device{rhs.device}, pool{rhs.pool}, 538 : allocations{std::move(rhs.allocations)}, num{rhs.num}, device{rhs.device}, pool{rhs.pool},
539 dld{rhs.dld} {} 539 dld{rhs.dld} {}
540 540
541 /// Assign an allocation transfering ownership from another allocation. 541 /// Assign an allocation transferring ownership from another allocation.
542 PoolAllocations& operator=(PoolAllocations&& rhs) noexcept { 542 PoolAllocations& operator=(PoolAllocations&& rhs) noexcept {
543 allocations = std::move(rhs.allocations); 543 allocations = std::move(rhs.allocations);
544 num = rhs.num; 544 num = rhs.num;