diff options
Diffstat (limited to 'src/video_core')
19 files changed, 34 insertions, 34 deletions
diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h index cdaf4f8d5..46bc9e322 100644 --- a/src/video_core/control/channel_state_cache.h +++ b/src/video_core/control/channel_state_cache.h | |||
| @@ -44,7 +44,7 @@ public: | |||
| 44 | template <class P> | 44 | template <class P> |
| 45 | class ChannelSetupCaches { | 45 | class ChannelSetupCaches { |
| 46 | public: | 46 | public: |
| 47 | /// Operations for seting the channel of execution. | 47 | /// Operations for setting the channel of execution. |
| 48 | virtual ~ChannelSetupCaches(); | 48 | virtual ~ChannelSetupCaches(); |
| 49 | 49 | ||
| 50 | /// Create channel state. | 50 | /// Create channel state. |
diff --git a/src/video_core/engines/sw_blitter/blitter.cpp b/src/video_core/engines/sw_blitter/blitter.cpp index 2f1ea4626..3c9f38559 100644 --- a/src/video_core/engines/sw_blitter/blitter.cpp +++ b/src/video_core/engines/sw_blitter/blitter.cpp | |||
| @@ -193,7 +193,7 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, | |||
| 193 | output_converter->ConvertFrom(impl->intermediate_dst, impl->dst_buffer); | 193 | output_converter->ConvertFrom(impl->intermediate_dst, impl->dst_buffer); |
| 194 | }; | 194 | }; |
| 195 | 195 | ||
| 196 | // Do actuall Blit | 196 | // Do actual Blit |
| 197 | 197 | ||
| 198 | impl->dst_buffer.resize(dst_copy_size); | 198 | impl->dst_buffer.resize(dst_copy_size); |
| 199 | if (src.linear == Fermi2D::MemoryLayout::BlockLinear) { | 199 | if (src.linear == Fermi2D::MemoryLayout::BlockLinear) { |
diff --git a/src/video_core/host_shaders/astc_decoder.comp b/src/video_core/host_shaders/astc_decoder.comp index d608678a3..bf2693559 100644 --- a/src/video_core/host_shaders/astc_decoder.comp +++ b/src/video_core/host_shaders/astc_decoder.comp | |||
| @@ -125,7 +125,7 @@ uvec4 local_buff; | |||
| 125 | uvec4 color_endpoint_data; | 125 | uvec4 color_endpoint_data; |
| 126 | int color_bitsread = 0; | 126 | int color_bitsread = 0; |
| 127 | 127 | ||
| 128 | // Four values, two endpoints, four maximum paritions | 128 | // Four values, two endpoints, four maximum partitions |
| 129 | uint color_values[32]; | 129 | uint color_values[32]; |
| 130 | int colvals_index = 0; | 130 | int colvals_index = 0; |
| 131 | 131 | ||
diff --git a/src/video_core/host_shaders/opengl_smaa.glsl b/src/video_core/host_shaders/opengl_smaa.glsl index 3cbe87bbf..419f89bca 100644 --- a/src/video_core/host_shaders/opengl_smaa.glsl +++ b/src/video_core/host_shaders/opengl_smaa.glsl | |||
| @@ -97,7 +97,7 @@ | |||
| 97 | * half-rate linear filtering on GCN. | 97 | * half-rate linear filtering on GCN. |
| 98 | * | 98 | * |
| 99 | * If SMAA is applied to 64-bit color buffers, switching to point filtering | 99 | * If SMAA is applied to 64-bit color buffers, switching to point filtering |
| 100 | * when accesing them will increase the performance. Search for | 100 | * when accessing them will increase the performance. Search for |
| 101 | * 'SMAASamplePoint' to see which textures may benefit from point | 101 | * 'SMAASamplePoint' to see which textures may benefit from point |
| 102 | * filtering, and where (which is basically the color input in the edge | 102 | * filtering, and where (which is basically the color input in the edge |
| 103 | * detection and resolve passes). | 103 | * detection and resolve passes). |
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index cf56392ef..51ae2de68 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h | |||
| @@ -103,8 +103,8 @@ public: | |||
| 103 | 103 | ||
| 104 | /** | 104 | /** |
| 105 | * Returns a vector with all the subranges of cpu addresses mapped beneath. | 105 | * Returns a vector with all the subranges of cpu addresses mapped beneath. |
| 106 | * if the region is continous, a single pair will be returned. If it's unmapped, an empty vector | 106 | * if the region is continuous, a single pair will be returned. If it's unmapped, an empty |
| 107 | * will be returned; | 107 | * vector will be returned; |
| 108 | */ | 108 | */ |
| 109 | std::vector<std::pair<GPUVAddr, std::size_t>> GetSubmappedRange(GPUVAddr gpu_addr, | 109 | std::vector<std::pair<GPUVAddr, std::size_t>> GetSubmappedRange(GPUVAddr gpu_addr, |
| 110 | std::size_t size) const; | 110 | std::size_t size) const; |
diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 00ce53e3e..8906ba6d8 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h | |||
| @@ -341,7 +341,7 @@ public: | |||
| 341 | 341 | ||
| 342 | /// Flushes the query to guest memory. | 342 | /// Flushes the query to guest memory. |
| 343 | virtual void Flush() { | 343 | virtual void Flush() { |
| 344 | // When counter is nullptr it means that it's just been reseted. We are supposed to write a | 344 | // When counter is nullptr it means that it's just been reset. We are supposed to write a |
| 345 | // zero in these cases. | 345 | // zero in these cases. |
| 346 | const u64 value = counter ? counter->Query() : 0; | 346 | const u64 value = counter ? counter->Query() : 0; |
| 347 | std::memcpy(host_ptr, &value, sizeof(u64)); | 347 | std::memcpy(host_ptr, &value, sizeof(u64)); |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 33748762f..abe0f3582 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -576,7 +576,7 @@ bool RasterizerOpenGL::AccelerateConditionalRendering() { | |||
| 576 | // Reimplement Host conditional rendering. | 576 | // Reimplement Host conditional rendering. |
| 577 | return false; | 577 | return false; |
| 578 | } | 578 | } |
| 579 | // Medium / Low Hack: stub any checks on queries writen into the buffer cache. | 579 | // Medium / Low Hack: stub any checks on queries written into the buffer cache. |
| 580 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; | 580 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; |
| 581 | Maxwell::ReportSemaphore::Compare cmp; | 581 | Maxwell::ReportSemaphore::Compare cmp; |
| 582 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), | 582 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 1f6562ef8..ad6978bd0 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -162,7 +162,7 @@ private: | |||
| 162 | /// Syncs the cull mode to match the guest state | 162 | /// Syncs the cull mode to match the guest state |
| 163 | void SyncCullMode(); | 163 | void SyncCullMode(); |
| 164 | 164 | ||
| 165 | /// Syncs the primitve restart to match the guest state | 165 | /// Syncs the primitive restart to match the guest state |
| 166 | void SyncPrimitiveRestart(); | 166 | void SyncPrimitiveRestart(); |
| 167 | 167 | ||
| 168 | /// Syncs the depth test state to match the guest state | 168 | /// Syncs the depth test state to match the guest state |
| @@ -246,7 +246,7 @@ private: | |||
| 246 | std::array<GLuint, MAX_TEXTURES> texture_handles{}; | 246 | std::array<GLuint, MAX_TEXTURES> texture_handles{}; |
| 247 | std::array<GLuint, MAX_IMAGES> image_handles{}; | 247 | std::array<GLuint, MAX_IMAGES> image_handles{}; |
| 248 | 248 | ||
| 249 | /// Number of commands queued to the OpenGL driver. Resetted on flush. | 249 | /// Number of commands queued to the OpenGL driver. Reset on flush. |
| 250 | size_t num_queued_commands = 0; | 250 | size_t num_queued_commands = 0; |
| 251 | bool has_written_global_memory = false; | 251 | bool has_written_global_memory = false; |
| 252 | 252 | ||
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp index f8398b511..e7df32d84 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp | |||
| @@ -271,7 +271,7 @@ bool FixedPipelineState::operator==(const FixedPipelineState& rhs) const noexcep | |||
| 271 | 271 | ||
| 272 | u32 FixedPipelineState::PackComparisonOp(Maxwell::ComparisonOp op) noexcept { | 272 | u32 FixedPipelineState::PackComparisonOp(Maxwell::ComparisonOp op) noexcept { |
| 273 | // OpenGL enums go from 0x200 to 0x207 and the others from 1 to 8 | 273 | // OpenGL enums go from 0x200 to 0x207 and the others from 1 to 8 |
| 274 | // If we substract 0x200 to OpenGL enums and 1 to the others we get a 0-7 range. | 274 | // If we subtract 0x200 to OpenGL enums and 1 to the others we get a 0-7 range. |
| 275 | // Perfect for a hash. | 275 | // Perfect for a hash. |
| 276 | const u32 value = static_cast<u32>(op); | 276 | const u32 value = static_cast<u32>(op); |
| 277 | return value - (value >= 0x200 ? 0x200 : 1); | 277 | return value - (value >= 0x200 ? 0x200 : 1); |
| @@ -322,8 +322,8 @@ Maxwell::StencilOp::Op FixedPipelineState::UnpackStencilOp(u32 packed) noexcept | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | u32 FixedPipelineState::PackCullFace(Maxwell::CullFace cull) noexcept { | 324 | u32 FixedPipelineState::PackCullFace(Maxwell::CullFace cull) noexcept { |
| 325 | // FrontAndBack is 0x408, by substracting 0x406 in it we get 2. | 325 | // FrontAndBack is 0x408, by subtracting 0x406 in it we get 2. |
| 326 | // Individual cull faces are in 0x404 and 0x405, substracting 0x404 we get 0 and 1. | 326 | // Individual cull faces are in 0x404 and 0x405, subtracting 0x404 we get 0 and 1. |
| 327 | const u32 value = static_cast<u32>(cull); | 327 | const u32 value = static_cast<u32>(cull); |
| 328 | return value - (value == 0x408 ? 0x406 : 0x404); | 328 | return value - (value == 0x408 ? 0x406 : 0x404); |
| 329 | } | 329 | } |
diff --git a/src/video_core/renderer_vulkan/vk_command_pool.cpp b/src/video_core/renderer_vulkan/vk_command_pool.cpp index 2f09de1c1..d0dbf7ca5 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_command_pool.cpp | |||
| @@ -22,8 +22,8 @@ CommandPool::CommandPool(MasterSemaphore& master_semaphore_, const Device& devic | |||
| 22 | CommandPool::~CommandPool() = default; | 22 | CommandPool::~CommandPool() = default; |
| 23 | 23 | ||
| 24 | void CommandPool::Allocate(size_t begin, size_t end) { | 24 | void CommandPool::Allocate(size_t begin, size_t end) { |
| 25 | // Command buffers are going to be commited, recorded, executed every single usage cycle. | 25 | // Command buffers are going to be committed, recorded, executed every single usage cycle. |
| 26 | // They are also going to be reseted when commited. | 26 | // They are also going to be reset when committed. |
| 27 | Pool& pool = pools.emplace_back(); | 27 | Pool& pool = pools.emplace_back(); |
| 28 | pool.handle = device.GetLogical().CreateCommandPool({ | 28 | pool.handle = device.GetLogical().CreateCommandPool({ |
| 29 | .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, | 29 | .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 855488ead..673ab478e 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -671,7 +671,7 @@ bool RasterizerVulkan::AccelerateConditionalRendering() { | |||
| 671 | // TODO(Blinkhawk): Reimplement Host conditional rendering. | 671 | // TODO(Blinkhawk): Reimplement Host conditional rendering. |
| 672 | return false; | 672 | return false; |
| 673 | } | 673 | } |
| 674 | // Medium / Low Hack: stub any checks on queries writen into the buffer cache. | 674 | // Medium / Low Hack: stub any checks on queries written into the buffer cache. |
| 675 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; | 675 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; |
| 676 | Maxwell::ReportSemaphore::Compare cmp; | 676 | Maxwell::ReportSemaphore::Compare cmp; |
| 677 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), | 677 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), |
diff --git a/src/video_core/renderer_vulkan/vk_resource_pool.cpp b/src/video_core/renderer_vulkan/vk_resource_pool.cpp index 6c8ac22f4..6572f82ba 100644 --- a/src/video_core/renderer_vulkan/vk_resource_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_resource_pool.cpp | |||
| @@ -37,7 +37,7 @@ size_t ResourcePool::CommitResource() { | |||
| 37 | found = free_resource; | 37 | found = free_resource; |
| 38 | } | 38 | } |
| 39 | } | 39 | } |
| 40 | // Free iterator is hinted to the resource after the one that's been commited. | 40 | // Free iterator is hinted to the resource after the one that's been committed. |
| 41 | hint_iterator = (*found + 1) % ticks.size(); | 41 | hint_iterator = (*found + 1) % ticks.size(); |
| 42 | return *found; | 42 | return *found; |
| 43 | } | 43 | } |
| @@ -46,7 +46,7 @@ size_t ResourcePool::ManageOverflow() { | |||
| 46 | const size_t old_capacity = ticks.size(); | 46 | const size_t old_capacity = ticks.size(); |
| 47 | Grow(); | 47 | Grow(); |
| 48 | 48 | ||
| 49 | // The last entry is guaranted to be free, since it's the first element of the freshly | 49 | // The last entry is guaranteed to be free, since it's the first element of the freshly |
| 50 | // allocated resources. | 50 | // allocated resources. |
| 51 | return old_capacity; | 51 | return old_capacity; |
| 52 | } | 52 | } |
diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index b6810eef9..85fdce6e5 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp | |||
| @@ -159,7 +159,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo | |||
| 159 | present_mode = ChooseSwapPresentMode(present_modes); | 159 | present_mode = ChooseSwapPresentMode(present_modes); |
| 160 | 160 | ||
| 161 | u32 requested_image_count{capabilities.minImageCount + 1}; | 161 | u32 requested_image_count{capabilities.minImageCount + 1}; |
| 162 | // Ensure Tripple buffering if possible. | 162 | // Ensure Triple buffering if possible. |
| 163 | if (capabilities.maxImageCount > 0) { | 163 | if (capabilities.maxImageCount > 0) { |
| 164 | if (requested_image_count > capabilities.maxImageCount) { | 164 | if (requested_image_count > capabilities.maxImageCount) { |
| 165 | requested_image_count = capabilities.maxImageCount; | 165 | requested_image_count = capabilities.maxImageCount; |
diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp index 4d4a6753b..009dab0b6 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp | |||
| @@ -25,7 +25,7 @@ void UpdateDescriptorQueue::TickFrame() { | |||
| 25 | 25 | ||
| 26 | void UpdateDescriptorQueue::Acquire() { | 26 | void UpdateDescriptorQueue::Acquire() { |
| 27 | // Minimum number of entries required. | 27 | // Minimum number of entries required. |
| 28 | // This is the maximum number of entries a single draw call migth use. | 28 | // This is the maximum number of entries a single draw call might use. |
| 29 | static constexpr size_t MIN_ENTRIES = 0x400; | 29 | static constexpr size_t MIN_ENTRIES = 0x400; |
| 30 | 30 | ||
| 31 | if (std::distance(payload.data(), payload_cursor) + MIN_ENTRIES >= payload.max_size()) { | 31 | if (std::distance(payload.data(), payload_cursor) + MIN_ENTRIES >= payload.max_size()) { |
diff --git a/src/video_core/texture_cache/image_base.h b/src/video_core/texture_cache/image_base.h index e8fa592d2..329396bb6 100644 --- a/src/video_core/texture_cache/image_base.h +++ b/src/video_core/texture_cache/image_base.h | |||
| @@ -25,7 +25,7 @@ enum class ImageFlagBits : u32 { | |||
| 25 | Registered = 1 << 6, ///< True when the image is registered | 25 | Registered = 1 << 6, ///< True when the image is registered |
| 26 | Picked = 1 << 7, ///< Temporary flag to mark the image as picked | 26 | Picked = 1 << 7, ///< Temporary flag to mark the image as picked |
| 27 | Remapped = 1 << 8, ///< Image has been remapped. | 27 | Remapped = 1 << 8, ///< Image has been remapped. |
| 28 | Sparse = 1 << 9, ///< Image has non continous submemory. | 28 | Sparse = 1 << 9, ///< Image has non continuous submemory. |
| 29 | 29 | ||
| 30 | // Garbage Collection Flags | 30 | // Garbage Collection Flags |
| 31 | BadOverlap = 1 << 10, ///< This image overlaps other but doesn't fit, has higher | 31 | BadOverlap = 1 << 10, ///< This image overlaps other but doesn't fit, has higher |
diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 4381eed1d..a68bc0d77 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp | |||
| @@ -1571,7 +1571,7 @@ static void DecompressBlock(std::span<const u8, 16> inBuf, const u32 blockWidth, | |||
| 1571 | assert(strm.GetBitsRead() + weightParams.GetPackedBitSize() == 128); | 1571 | assert(strm.GetBitsRead() + weightParams.GetPackedBitSize() == 128); |
| 1572 | 1572 | ||
| 1573 | // Decode both color data and texel weight data | 1573 | // Decode both color data and texel weight data |
| 1574 | u32 colorValues[32]; // Four values, two endpoints, four maximum paritions | 1574 | u32 colorValues[32]; // Four values, two endpoints, four maximum partitions |
| 1575 | DecodeColorValues(colorValues, colorEndpointData, colorEndpointMode, nPartitions, | 1575 | DecodeColorValues(colorValues, colorEndpointData, colorEndpointMode, nPartitions, |
| 1576 | colorDataBits); | 1576 | colorDataBits); |
| 1577 | 1577 | ||
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; |