diff options
Diffstat (limited to '')
6 files changed, 16 insertions, 16 deletions
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp index e7df32d84..133ab0170 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp @@ -231,10 +231,10 @@ void FixedPipelineState::DynamicState::Refresh(const Maxwell& regs) { void FixedPipelineState::DynamicState::Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology_, - bool base_feautures_supported) { + bool base_features_supported) { logic_op.Assign(PackLogicOp(regs.logic_op.op)); - if (base_feautures_supported) { + if (base_features_supported) { return; } diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.h b/src/video_core/renderer_vulkan/fixed_pipeline_state.h index 98ea20b42..dfe6d8032 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.h +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.h @@ -165,7 +165,7 @@ struct FixedPipelineState { void Refresh(const Maxwell& regs); void Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology, - bool base_feautures_supported); + bool base_features_supported); void Refresh3(const Maxwell& regs); Maxwell::ComparisonOp DepthTestFunc() const noexcept { diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.h b/src/video_core/renderer_vulkan/vk_blit_screen.h index 16b882b6d..78b32416d 100644 --- a/src/video_core/renderer_vulkan/vk_blit_screen.h +++ b/src/video_core/renderer_vulkan/vk_blit_screen.h @@ -130,7 +130,7 @@ private: vk::DescriptorPool descriptor_pool; vk::DescriptorSetLayout descriptor_set_layout; vk::PipelineLayout pipeline_layout; - vk::Pipeline nearest_neightbor_pipeline; + vk::Pipeline nearest_neighbor_pipeline; vk::Pipeline bilinear_pipeline; vk::Pipeline bicubic_pipeline; vk::Pipeline gaussian_pipeline; diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 95954ade7..ad4caf688 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp @@ -120,8 +120,8 @@ public: scheduler{scheduler_}, memory_allocator{memory_allocator_} { current_bank = nullptr; current_query = nullptr; - ammend_value = 0; - acumulation_value = 0; + amend_value = 0; + accumulation_value = 0; queries_prefix_scan_pass = std::make_unique<QueriesPrefixScanPass>( device, scheduler, descriptor_pool, compute_pass_descriptor_queue); @@ -176,8 +176,8 @@ public: } AbandonCurrentQuery(); std::function<void()> func([this, counts = pending_flush_queries.size()] { - ammend_value = 0; - acumulation_value = 0; + amend_value = 0; + accumulation_value = 0; }); rasterizer->SyncOperation(std::move(func)); accumulation_since_last_sync = false; @@ -307,7 +307,7 @@ public: } ReplicateCurrentQueryIfNeeded(); - std::function<void()> func([this] { ammend_value = acumulation_value; }); + std::function<void()> func([this] { amend_value = accumulation_value; }); rasterizer->SyncOperation(std::move(func)); AbandonCurrentQuery(); num_slots_used = 0; @@ -512,7 +512,7 @@ private: pending_flush_queries.push_back(index); std::function<void()> func([this, index] { auto* query = GetQuery(index); - query->value += GetAmmendValue(); + query->value += GetAmendValue(); SetAccumulationValue(query->value); Free(index); }); @@ -1169,7 +1169,7 @@ struct QueryCacheRuntimeImpl { primitives_succeeded_streamer( static_cast<size_t>(QueryType::StreamingPrimitivesSucceeded), runtime, tfb_streamer, cpu_memory_), - primitives_needed_minus_suceeded_streamer( + primitives_needed_minus_succeeded_streamer( static_cast<size_t>(QueryType::StreamingPrimitivesNeededMinusSucceeded), runtime, 0u), hcr_setup{}, hcr_is_set{}, is_hcr_running{}, maxwell3d{} { @@ -1208,7 +1208,7 @@ struct QueryCacheRuntimeImpl { SamplesStreamer sample_streamer; TFBCounterStreamer tfb_streamer; PrimitivesSucceededStreamer primitives_succeeded_streamer; - VideoCommon::StubStreamer<QueryCacheParams> primitives_needed_minus_suceeded_streamer; + VideoCommon::StubStreamer<QueryCacheParams> primitives_needed_minus_succeeded_streamer; std::vector<std::pair<VAddr, VAddr>> little_cache; std::vector<std::pair<VkBuffer, VkDeviceSize>> buffers_to_upload_to; @@ -1433,7 +1433,7 @@ VideoCommon::StreamerInterface* QueryCacheRuntime::GetStreamerInterface(QueryTyp case QueryType::StreamingPrimitivesSucceeded: return &impl->primitives_succeeded_streamer; case QueryType::StreamingPrimitivesNeededMinusSucceeded: - return &impl->primitives_needed_minus_suceeded_streamer; + return &impl->primitives_needed_minus_succeeded_streamer; default: return nullptr; } diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp index b278614e6..03a0b7280 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp @@ -236,14 +236,14 @@ void StagingBufferPool::ReleaseLevel(StagingBuffersCache& cache, size_t log2) { auto& entries = staging.entries; const size_t old_size = entries.size(); - const auto is_deleteable = [this](const StagingBuffer& entry) { + const auto is_deletable = [this](const StagingBuffer& entry) { return scheduler.IsFree(entry.tick); }; const size_t begin_offset = staging.delete_index; const size_t end_offset = std::min(begin_offset + deletions_per_tick, old_size); const auto begin = entries.begin() + begin_offset; const auto end = entries.begin() + end_offset; - entries.erase(std::remove_if(begin, end, is_deleteable), end); + entries.erase(std::remove_if(begin, end, is_deletable), end); const size_t new_size = entries.size(); staging.delete_index += deletions_per_tick; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 38b1619df..832b5e2b1 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -125,7 +125,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) { MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, info.format); VkImageCreateFlags flags{}; if (info.type == ImageType::e2D && info.resources.layers >= 6 && - info.size.width == info.size.height && !device.HasBrokenCubeImageCompability()) { + info.size.width == info.size.height && !device.HasBrokenCubeImageCompatibility()) { flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; } if (info.type == ImageType::e3D) { |