summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_vulkan
diff options
context:
space:
mode:
authorGravatar Viktor Szépe2024-01-07 22:44:55 +0000
committerGravatar Viktor Szépe2024-01-07 22:44:55 +0000
commit53085a45e0b2cc995f4056de40116a66f7ae7c08 (patch)
tree532a7e9b391510ea4e9fb254d669b405de7b289d /src/video_core/renderer_vulkan
parentMerge pull request #12560 from GayPotatoEmma/master (diff)
downloadyuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.gz
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.xz
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.zip
Fix typos in video_core
Diffstat (limited to 'src/video_core/renderer_vulkan')
-rw-r--r--src/video_core/renderer_vulkan/fixed_pipeline_state.cpp4
-rw-r--r--src/video_core/renderer_vulkan/fixed_pipeline_state.h2
-rw-r--r--src/video_core/renderer_vulkan/vk_blit_screen.h2
-rw-r--r--src/video_core/renderer_vulkan/vk_query_cache.cpp18
-rw-r--r--src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp4
-rw-r--r--src/video_core/renderer_vulkan/vk_texture_cache.cpp2
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) {
231 231
232void FixedPipelineState::DynamicState::Refresh2(const Maxwell& regs, 232void FixedPipelineState::DynamicState::Refresh2(const Maxwell& regs,
233 Maxwell::PrimitiveTopology topology_, 233 Maxwell::PrimitiveTopology topology_,
234 bool base_feautures_supported) { 234 bool base_features_supported) {
235 logic_op.Assign(PackLogicOp(regs.logic_op.op)); 235 logic_op.Assign(PackLogicOp(regs.logic_op.op));
236 236
237 if (base_feautures_supported) { 237 if (base_features_supported) {
238 return; 238 return;
239 } 239 }
240 240
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 {
165 165
166 void Refresh(const Maxwell& regs); 166 void Refresh(const Maxwell& regs);
167 void Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology, 167 void Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology,
168 bool base_feautures_supported); 168 bool base_features_supported);
169 void Refresh3(const Maxwell& regs); 169 void Refresh3(const Maxwell& regs);
170 170
171 Maxwell::ComparisonOp DepthTestFunc() const noexcept { 171 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:
130 vk::DescriptorPool descriptor_pool; 130 vk::DescriptorPool descriptor_pool;
131 vk::DescriptorSetLayout descriptor_set_layout; 131 vk::DescriptorSetLayout descriptor_set_layout;
132 vk::PipelineLayout pipeline_layout; 132 vk::PipelineLayout pipeline_layout;
133 vk::Pipeline nearest_neightbor_pipeline; 133 vk::Pipeline nearest_neighbor_pipeline;
134 vk::Pipeline bilinear_pipeline; 134 vk::Pipeline bilinear_pipeline;
135 vk::Pipeline bicubic_pipeline; 135 vk::Pipeline bicubic_pipeline;
136 vk::Pipeline gaussian_pipeline; 136 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:
120 scheduler{scheduler_}, memory_allocator{memory_allocator_} { 120 scheduler{scheduler_}, memory_allocator{memory_allocator_} {
121 current_bank = nullptr; 121 current_bank = nullptr;
122 current_query = nullptr; 122 current_query = nullptr;
123 ammend_value = 0; 123 amend_value = 0;
124 acumulation_value = 0; 124 accumulation_value = 0;
125 queries_prefix_scan_pass = std::make_unique<QueriesPrefixScanPass>( 125 queries_prefix_scan_pass = std::make_unique<QueriesPrefixScanPass>(
126 device, scheduler, descriptor_pool, compute_pass_descriptor_queue); 126 device, scheduler, descriptor_pool, compute_pass_descriptor_queue);
127 127
@@ -176,8 +176,8 @@ public:
176 } 176 }
177 AbandonCurrentQuery(); 177 AbandonCurrentQuery();
178 std::function<void()> func([this, counts = pending_flush_queries.size()] { 178 std::function<void()> func([this, counts = pending_flush_queries.size()] {
179 ammend_value = 0; 179 amend_value = 0;
180 acumulation_value = 0; 180 accumulation_value = 0;
181 }); 181 });
182 rasterizer->SyncOperation(std::move(func)); 182 rasterizer->SyncOperation(std::move(func));
183 accumulation_since_last_sync = false; 183 accumulation_since_last_sync = false;
@@ -307,7 +307,7 @@ public:
307 } 307 }
308 308
309 ReplicateCurrentQueryIfNeeded(); 309 ReplicateCurrentQueryIfNeeded();
310 std::function<void()> func([this] { ammend_value = acumulation_value; }); 310 std::function<void()> func([this] { amend_value = accumulation_value; });
311 rasterizer->SyncOperation(std::move(func)); 311 rasterizer->SyncOperation(std::move(func));
312 AbandonCurrentQuery(); 312 AbandonCurrentQuery();
313 num_slots_used = 0; 313 num_slots_used = 0;
@@ -512,7 +512,7 @@ private:
512 pending_flush_queries.push_back(index); 512 pending_flush_queries.push_back(index);
513 std::function<void()> func([this, index] { 513 std::function<void()> func([this, index] {
514 auto* query = GetQuery(index); 514 auto* query = GetQuery(index);
515 query->value += GetAmmendValue(); 515 query->value += GetAmendValue();
516 SetAccumulationValue(query->value); 516 SetAccumulationValue(query->value);
517 Free(index); 517 Free(index);
518 }); 518 });
@@ -1169,7 +1169,7 @@ struct QueryCacheRuntimeImpl {
1169 primitives_succeeded_streamer( 1169 primitives_succeeded_streamer(
1170 static_cast<size_t>(QueryType::StreamingPrimitivesSucceeded), runtime, tfb_streamer, 1170 static_cast<size_t>(QueryType::StreamingPrimitivesSucceeded), runtime, tfb_streamer,
1171 cpu_memory_), 1171 cpu_memory_),
1172 primitives_needed_minus_suceeded_streamer( 1172 primitives_needed_minus_succeeded_streamer(
1173 static_cast<size_t>(QueryType::StreamingPrimitivesNeededMinusSucceeded), runtime, 0u), 1173 static_cast<size_t>(QueryType::StreamingPrimitivesNeededMinusSucceeded), runtime, 0u),
1174 hcr_setup{}, hcr_is_set{}, is_hcr_running{}, maxwell3d{} { 1174 hcr_setup{}, hcr_is_set{}, is_hcr_running{}, maxwell3d{} {
1175 1175
@@ -1208,7 +1208,7 @@ struct QueryCacheRuntimeImpl {
1208 SamplesStreamer sample_streamer; 1208 SamplesStreamer sample_streamer;
1209 TFBCounterStreamer tfb_streamer; 1209 TFBCounterStreamer tfb_streamer;
1210 PrimitivesSucceededStreamer primitives_succeeded_streamer; 1210 PrimitivesSucceededStreamer primitives_succeeded_streamer;
1211 VideoCommon::StubStreamer<QueryCacheParams> primitives_needed_minus_suceeded_streamer; 1211 VideoCommon::StubStreamer<QueryCacheParams> primitives_needed_minus_succeeded_streamer;
1212 1212
1213 std::vector<std::pair<VAddr, VAddr>> little_cache; 1213 std::vector<std::pair<VAddr, VAddr>> little_cache;
1214 std::vector<std::pair<VkBuffer, VkDeviceSize>> buffers_to_upload_to; 1214 std::vector<std::pair<VkBuffer, VkDeviceSize>> buffers_to_upload_to;
@@ -1433,7 +1433,7 @@ VideoCommon::StreamerInterface* QueryCacheRuntime::GetStreamerInterface(QueryTyp
1433 case QueryType::StreamingPrimitivesSucceeded: 1433 case QueryType::StreamingPrimitivesSucceeded:
1434 return &impl->primitives_succeeded_streamer; 1434 return &impl->primitives_succeeded_streamer;
1435 case QueryType::StreamingPrimitivesNeededMinusSucceeded: 1435 case QueryType::StreamingPrimitivesNeededMinusSucceeded:
1436 return &impl->primitives_needed_minus_suceeded_streamer; 1436 return &impl->primitives_needed_minus_succeeded_streamer;
1437 default: 1437 default:
1438 return nullptr; 1438 return nullptr;
1439 } 1439 }
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) {
236 auto& entries = staging.entries; 236 auto& entries = staging.entries;
237 const size_t old_size = entries.size(); 237 const size_t old_size = entries.size();
238 238
239 const auto is_deleteable = [this](const StagingBuffer& entry) { 239 const auto is_deletable = [this](const StagingBuffer& entry) {
240 return scheduler.IsFree(entry.tick); 240 return scheduler.IsFree(entry.tick);
241 }; 241 };
242 const size_t begin_offset = staging.delete_index; 242 const size_t begin_offset = staging.delete_index;
243 const size_t end_offset = std::min(begin_offset + deletions_per_tick, old_size); 243 const size_t end_offset = std::min(begin_offset + deletions_per_tick, old_size);
244 const auto begin = entries.begin() + begin_offset; 244 const auto begin = entries.begin() + begin_offset;
245 const auto end = entries.begin() + end_offset; 245 const auto end = entries.begin() + end_offset;
246 entries.erase(std::remove_if(begin, end, is_deleteable), end); 246 entries.erase(std::remove_if(begin, end, is_deletable), end);
247 247
248 const size_t new_size = entries.size(); 248 const size_t new_size = entries.size();
249 staging.delete_index += deletions_per_tick; 249 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) {
125 MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, info.format); 125 MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, info.format);
126 VkImageCreateFlags flags{}; 126 VkImageCreateFlags flags{};
127 if (info.type == ImageType::e2D && info.resources.layers >= 6 && 127 if (info.type == ImageType::e2D && info.resources.layers >= 6 &&
128 info.size.width == info.size.height && !device.HasBrokenCubeImageCompability()) { 128 info.size.width == info.size.height && !device.HasBrokenCubeImageCompatibility()) {
129 flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; 129 flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;
130 } 130 }
131 if (info.type == ImageType::e3D) { 131 if (info.type == ImageType::e3D) {