summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/shader_recompiler/environment.h6
-rw-r--r--src/shader_recompiler/ir_opt/constant_propagation_pass.cpp2
-rw-r--r--src/video_core/buffer_cache/memory_tracker_base.h4
-rw-r--r--src/video_core/control/channel_state_cache.h4
-rw-r--r--src/video_core/control/channel_state_cache.inc2
-rw-r--r--src/video_core/engines/maxwell_3d.h10
-rw-r--r--src/video_core/engines/sw_blitter/blitter.cpp8
-rw-r--r--src/video_core/host1x/codecs/vp8.h2
-rw-r--r--src/video_core/host_shaders/astc_decoder.comp18
-rw-r--r--src/video_core/query_cache/query_cache.h2
-rw-r--r--src/video_core/query_cache/query_stream.h10
-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
-rw-r--r--src/video_core/shader_environment.cpp6
-rw-r--r--src/video_core/vulkan_common/vulkan_device.h2
-rw-r--r--src/video_core/vulkan_common/vulkan_memory_allocator.cpp4
20 files changed, 56 insertions, 56 deletions
diff --git a/src/shader_recompiler/environment.h b/src/shader_recompiler/environment.h
index e30bf094a..5dbbc7e61 100644
--- a/src/shader_recompiler/environment.h
+++ b/src/shader_recompiler/environment.h
@@ -59,8 +59,8 @@ public:
59 return start_address; 59 return start_address;
60 } 60 }
61 61
62 [[nodiscard]] bool IsPropietaryDriver() const noexcept { 62 [[nodiscard]] bool IsProprietaryDriver() const noexcept {
63 return is_propietary_driver; 63 return is_proprietary_driver;
64 } 64 }
65 65
66protected: 66protected:
@@ -68,7 +68,7 @@ protected:
68 std::array<u32, 8> gp_passthrough_mask{}; 68 std::array<u32, 8> gp_passthrough_mask{};
69 Stage stage{}; 69 Stage stage{};
70 u32 start_address{}; 70 u32 start_address{};
71 bool is_propietary_driver{}; 71 bool is_proprietary_driver{};
72}; 72};
73 73
74} // namespace Shader 74} // namespace Shader
diff --git a/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp b/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
index e4a73a360..12d7b2d7f 100644
--- a/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
+++ b/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
@@ -1084,7 +1084,7 @@ void ConstantPropagation(Environment& env, IR::Block& block, IR::Inst& inst) {
1084 if (env.HasHLEMacroState()) { 1084 if (env.HasHLEMacroState()) {
1085 FoldConstBuffer(env, block, inst); 1085 FoldConstBuffer(env, block, inst);
1086 } 1086 }
1087 if (env.IsPropietaryDriver()) { 1087 if (env.IsProprietaryDriver()) {
1088 FoldDriverConstBuffer(env, block, inst, 1); 1088 FoldDriverConstBuffer(env, block, inst, 1);
1089 } 1089 }
1090 break; 1090 break;
diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h
index 6036b21c9..6c1c8287b 100644
--- a/src/video_core/buffer_cache/memory_tracker_base.h
+++ b/src/video_core/buffer_cache/memory_tracker_base.h
@@ -267,10 +267,10 @@ private:
267 top_tier[page_index] = GetNewManager(base_cpu_addr); 267 top_tier[page_index] = GetNewManager(base_cpu_addr);
268 } 268 }
269 269
270 Manager* GetNewManager(VAddr base_cpu_addess) { 270 Manager* GetNewManager(VAddr base_cpu_address) {
271 const auto on_return = [&] { 271 const auto on_return = [&] {
272 auto* new_manager = free_managers.front(); 272 auto* new_manager = free_managers.front();
273 new_manager->SetCpuAddress(base_cpu_addess); 273 new_manager->SetCpuAddress(base_cpu_address);
274 free_managers.pop_front(); 274 free_managers.pop_front();
275 return new_manager; 275 return new_manager;
276 }; 276 };
diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h
index 5574e1fba..1dbfda299 100644
--- a/src/video_core/control/channel_state_cache.h
+++ b/src/video_core/control/channel_state_cache.h
@@ -85,12 +85,12 @@ protected:
85 std::deque<size_t> free_channel_ids; 85 std::deque<size_t> free_channel_ids;
86 std::unordered_map<s32, size_t> channel_map; 86 std::unordered_map<s32, size_t> channel_map;
87 std::vector<size_t> active_channel_ids; 87 std::vector<size_t> active_channel_ids;
88 struct AddresSpaceRef { 88 struct AddressSpaceRef {
89 size_t ref_count; 89 size_t ref_count;
90 size_t storage_id; 90 size_t storage_id;
91 Tegra::MemoryManager* gpu_memory; 91 Tegra::MemoryManager* gpu_memory;
92 }; 92 };
93 std::unordered_map<size_t, AddresSpaceRef> address_spaces; 93 std::unordered_map<size_t, AddressSpaceRef> address_spaces;
94 mutable std::mutex config_mutex; 94 mutable std::mutex config_mutex;
95 95
96 virtual void OnGPUASRegister([[maybe_unused]] size_t map_id) {} 96 virtual void OnGPUASRegister([[maybe_unused]] size_t map_id) {}
diff --git a/src/video_core/control/channel_state_cache.inc b/src/video_core/control/channel_state_cache.inc
index 460313893..31f792ddd 100644
--- a/src/video_core/control/channel_state_cache.inc
+++ b/src/video_core/control/channel_state_cache.inc
@@ -38,7 +38,7 @@ void ChannelSetupCaches<P>::CreateChannel(struct Tegra::Control::ChannelState& c
38 as_it->second.ref_count++; 38 as_it->second.ref_count++;
39 return; 39 return;
40 } 40 }
41 AddresSpaceRef new_gpu_mem_ref{ 41 AddressSpaceRef new_gpu_mem_ref{
42 .ref_count = 1, 42 .ref_count = 1,
43 .storage_id = address_spaces.size(), 43 .storage_id = address_spaces.size(),
44 .gpu_memory = channel.memory_manager.get(), 44 .gpu_memory = channel.memory_manager.get(),
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index 17faacc37..6b4f1c570 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -958,7 +958,7 @@ public:
958 enum class ClearReport : u32 { 958 enum class ClearReport : u32 {
959 ZPassPixelCount = 0x01, 959 ZPassPixelCount = 0x01,
960 ZCullStats = 0x02, 960 ZCullStats = 0x02,
961 StreamingPrimitvesNeededMinusSucceeded = 0x03, 961 StreamingPrimitivesNeededMinusSucceeded = 0x03,
962 AlphaBetaClocks = 0x04, 962 AlphaBetaClocks = 0x04,
963 StreamingPrimitivesSucceeded = 0x10, 963 StreamingPrimitivesSucceeded = 0x10,
964 StreamingPrimitivesNeeded = 0x11, 964 StreamingPrimitivesNeeded = 0x11,
@@ -2383,8 +2383,8 @@ public:
2383 }; 2383 };
2384 2384
2385 enum class Release : u32 { 2385 enum class Release : u32 {
2386 AfterAllPreceedingReads = 0, 2386 AfterAllPrecedingReads = 0,
2387 AfterAllPreceedingWrites = 1, 2387 AfterAllPrecedingWrites = 1,
2388 }; 2388 };
2389 2389
2390 enum class Acquire : u32 { 2390 enum class Acquire : u32 {
@@ -2869,7 +2869,7 @@ public:
2869 u32 global_base_instance_index; ///< 0x1438 2869 u32 global_base_instance_index; ///< 0x1438
2870 INSERT_PADDING_BYTES_NOINIT(0x14); 2870 INSERT_PADDING_BYTES_NOINIT(0x14);
2871 RegisterWatermarks ps_warp_watermarks; ///< 0x1450 2871 RegisterWatermarks ps_warp_watermarks; ///< 0x1450
2872 RegisterWatermarks ps_regster_watermarks; ///< 0x1454 2872 RegisterWatermarks ps_register_watermarks; ///< 0x1454
2873 INSERT_PADDING_BYTES_NOINIT(0xC); 2873 INSERT_PADDING_BYTES_NOINIT(0xC);
2874 u32 store_zcull; ///< 0x1464 2874 u32 store_zcull; ///< 0x1464
2875 INSERT_PADDING_BYTES_NOINIT(0x18); 2875 INSERT_PADDING_BYTES_NOINIT(0x18);
@@ -3444,7 +3444,7 @@ ASSERT_REG_POSITION(invalidate_texture_header_cache_no_wfi, 0x1428);
3444ASSERT_REG_POSITION(global_base_vertex_index, 0x1434); 3444ASSERT_REG_POSITION(global_base_vertex_index, 0x1434);
3445ASSERT_REG_POSITION(global_base_instance_index, 0x1438); 3445ASSERT_REG_POSITION(global_base_instance_index, 0x1438);
3446ASSERT_REG_POSITION(ps_warp_watermarks, 0x1450); 3446ASSERT_REG_POSITION(ps_warp_watermarks, 0x1450);
3447ASSERT_REG_POSITION(ps_regster_watermarks, 0x1454); 3447ASSERT_REG_POSITION(ps_register_watermarks, 0x1454);
3448ASSERT_REG_POSITION(store_zcull, 0x1464); 3448ASSERT_REG_POSITION(store_zcull, 0x1464);
3449ASSERT_REG_POSITION(iterated_blend_constants, 0x1480); 3449ASSERT_REG_POSITION(iterated_blend_constants, 0x1480);
3450ASSERT_REG_POSITION(load_zcull, 0x1500); 3450ASSERT_REG_POSITION(load_zcull, 0x1500);
diff --git a/src/video_core/engines/sw_blitter/blitter.cpp b/src/video_core/engines/sw_blitter/blitter.cpp
index 3a599f466..67ce9134b 100644
--- a/src/video_core/engines/sw_blitter/blitter.cpp
+++ b/src/video_core/engines/sw_blitter/blitter.cpp
@@ -171,12 +171,12 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst,
171 const bool no_passthrough = 171 const bool no_passthrough =
172 src.format != dst.format || src_extent_x != dst_extent_x || src_extent_y != dst_extent_y; 172 src.format != dst.format || src_extent_x != dst_extent_x || src_extent_y != dst_extent_y;
173 173
174 const auto convertion_phase_same_format = [&]() { 174 const auto conversion_phase_same_format = [&]() {
175 NearestNeighbor(impl->src_buffer, impl->dst_buffer, src_extent_x, src_extent_y, 175 NearestNeighbor(impl->src_buffer, impl->dst_buffer, src_extent_x, src_extent_y,
176 dst_extent_x, dst_extent_y, dst_bytes_per_pixel); 176 dst_extent_x, dst_extent_y, dst_bytes_per_pixel);
177 }; 177 };
178 178
179 const auto convertion_phase_ir = [&]() { 179 const auto conversion_phase_ir = [&]() {
180 auto* input_converter = impl->converter_factory.GetFormatConverter(src.format); 180 auto* input_converter = impl->converter_factory.GetFormatConverter(src.format);
181 impl->intermediate_src.resize_destructive((src_copy_size / src_bytes_per_pixel) * 181 impl->intermediate_src.resize_destructive((src_copy_size / src_bytes_per_pixel) *
182 ir_components); 182 ir_components);
@@ -211,9 +211,9 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst,
211 // Conversion Phase 211 // Conversion Phase
212 if (no_passthrough) { 212 if (no_passthrough) {
213 if (src.format != dst.format || config.filter == Fermi2D::Filter::Bilinear) { 213 if (src.format != dst.format || config.filter == Fermi2D::Filter::Bilinear) {
214 convertion_phase_ir(); 214 conversion_phase_ir();
215 } else { 215 } else {
216 convertion_phase_same_format(); 216 conversion_phase_same_format();
217 } 217 }
218 } else { 218 } else {
219 impl->dst_buffer.swap(impl->src_buffer); 219 impl->dst_buffer.swap(impl->src_buffer);
diff --git a/src/video_core/host1x/codecs/vp8.h b/src/video_core/host1x/codecs/vp8.h
index 7926b73f3..5945e4658 100644
--- a/src/video_core/host1x/codecs/vp8.h
+++ b/src/video_core/host1x/codecs/vp8.h
@@ -42,7 +42,7 @@ private:
42 u8 raw; 42 u8 raw;
43 BitField<0, 2, u8> tile_format; 43 BitField<0, 2, u8> tile_format;
44 BitField<2, 3, u8> gob_height; 44 BitField<2, 3, u8> gob_height;
45 BitField<5, 3, u8> reserverd_surface_format; 45 BitField<5, 3, u8> reserved_surface_format;
46 }; 46 };
47 u8 error_conceal_on; // 1: error conceal on; 0: off 47 u8 error_conceal_on; // 1: error conceal on; 0: off
48 u32 first_part_size; // the size of first partition(frame header and mb header partition) 48 u32 first_part_size; // the size of first partition(frame header and mb header partition)
diff --git a/src/video_core/host_shaders/astc_decoder.comp b/src/video_core/host_shaders/astc_decoder.comp
index 5ff17cd0c..6e4535d45 100644
--- a/src/video_core/host_shaders/astc_decoder.comp
+++ b/src/video_core/host_shaders/astc_decoder.comp
@@ -803,7 +803,7 @@ void UnquantizeTexelWeights(uvec2 size, bool is_dual_plane) {
803 } 803 }
804} 804}
805 805
806uint GetUnquantizedTexelWieght(uint offset_base, uint plane, bool is_dual_plane) { 806uint GetUnquantizedTexelWeight(uint offset_base, uint plane, bool is_dual_plane) {
807 const uint offset = is_dual_plane ? 2 * offset_base + plane : offset_base; 807 const uint offset = is_dual_plane ? 2 * offset_base + plane : offset_base;
808 return result_vector[offset]; 808 return result_vector[offset];
809} 809}
@@ -833,23 +833,23 @@ uvec4 GetUnquantizedWeightVector(uint t, uint s, uvec2 size, uint plane_index, b
833 833
834 if (v0 < area) { 834 if (v0 < area) {
835 const uint offset_base = v0; 835 const uint offset_base = v0;
836 p0.x = GetUnquantizedTexelWieght(offset_base, 0, is_dual_plane); 836 p0.x = GetUnquantizedTexelWeight(offset_base, 0, is_dual_plane);
837 p1.x = GetUnquantizedTexelWieght(offset_base, 1, is_dual_plane); 837 p1.x = GetUnquantizedTexelWeight(offset_base, 1, is_dual_plane);
838 } 838 }
839 if ((v0 + 1) < (area)) { 839 if ((v0 + 1) < (area)) {
840 const uint offset_base = v0 + 1; 840 const uint offset_base = v0 + 1;
841 p0.y = GetUnquantizedTexelWieght(offset_base, 0, is_dual_plane); 841 p0.y = GetUnquantizedTexelWeight(offset_base, 0, is_dual_plane);
842 p1.y = GetUnquantizedTexelWieght(offset_base, 1, is_dual_plane); 842 p1.y = GetUnquantizedTexelWeight(offset_base, 1, is_dual_plane);
843 } 843 }
844 if ((v0 + size.x) < (area)) { 844 if ((v0 + size.x) < (area)) {
845 const uint offset_base = v0 + size.x; 845 const uint offset_base = v0 + size.x;
846 p0.z = GetUnquantizedTexelWieght(offset_base, 0, is_dual_plane); 846 p0.z = GetUnquantizedTexelWeight(offset_base, 0, is_dual_plane);
847 p1.z = GetUnquantizedTexelWieght(offset_base, 1, is_dual_plane); 847 p1.z = GetUnquantizedTexelWeight(offset_base, 1, is_dual_plane);
848 } 848 }
849 if ((v0 + size.x + 1) < (area)) { 849 if ((v0 + size.x + 1) < (area)) {
850 const uint offset_base = v0 + size.x + 1; 850 const uint offset_base = v0 + size.x + 1;
851 p0.w = GetUnquantizedTexelWieght(offset_base, 0, is_dual_plane); 851 p0.w = GetUnquantizedTexelWeight(offset_base, 0, is_dual_plane);
852 p1.w = GetUnquantizedTexelWieght(offset_base, 1, is_dual_plane); 852 p1.w = GetUnquantizedTexelWeight(offset_base, 1, is_dual_plane);
853 } 853 }
854 854
855 const uint primary_weight = (uint(dot(p0, w)) + 8) >> 4; 855 const uint primary_weight = (uint(dot(p0, w)) + 8) >> 4;
diff --git a/src/video_core/query_cache/query_cache.h b/src/video_core/query_cache/query_cache.h
index efa9adf7a..94f0c4466 100644
--- a/src/video_core/query_cache/query_cache.h
+++ b/src/video_core/query_cache/query_cache.h
@@ -269,7 +269,7 @@ void QueryCacheBase<Traits>::CounterReport(GPUVAddr addr, QueryType counter_type
269 ASSERT(false); 269 ASSERT(false);
270 return; 270 return;
271 } 271 }
272 query_base->value += streamer->GetAmmendValue(); 272 query_base->value += streamer->GetAmendValue();
273 streamer->SetAccumulationValue(query_base->value); 273 streamer->SetAccumulationValue(query_base->value);
274 if (True(query_base->flags & QueryFlagBits::HasTimestamp)) { 274 if (True(query_base->flags & QueryFlagBits::HasTimestamp)) {
275 u64 timestamp = impl->gpu.GetTicks(); 275 u64 timestamp = impl->gpu.GetTicks();
diff --git a/src/video_core/query_cache/query_stream.h b/src/video_core/query_cache/query_stream.h
index 39da6ac07..d9040acd2 100644
--- a/src/video_core/query_cache/query_stream.h
+++ b/src/video_core/query_cache/query_stream.h
@@ -78,12 +78,12 @@ public:
78 return dependence_mask; 78 return dependence_mask;
79 } 79 }
80 80
81 u64 GetAmmendValue() const { 81 u64 GetAmendValue() const {
82 return ammend_value; 82 return amend_value;
83 } 83 }
84 84
85 void SetAccumulationValue(u64 new_value) { 85 void SetAccumulationValue(u64 new_value) {
86 acumulation_value = new_value; 86 accumulation_value = new_value;
87 } 87 }
88 88
89protected: 89protected:
@@ -95,8 +95,8 @@ protected:
95 const size_t id; 95 const size_t id;
96 u64 dependence_mask; 96 u64 dependence_mask;
97 u64 dependent_mask; 97 u64 dependent_mask;
98 u64 ammend_value{}; 98 u64 amend_value{};
99 u64 acumulation_value{}; 99 u64 accumulation_value{};
100}; 100};
101 101
102template <typename QueryType> 102template <typename QueryType>
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) {
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp
index 492440ac4..250fde96c 100644
--- a/src/video_core/shader_environment.cpp
+++ b/src/video_core/shader_environment.cpp
@@ -322,7 +322,7 @@ GraphicsEnvironment::GraphicsEnvironment(Tegra::Engines::Maxwell3D& maxwell3d_,
322 ASSERT(local_size <= std::numeric_limits<u32>::max()); 322 ASSERT(local_size <= std::numeric_limits<u32>::max());
323 local_memory_size = static_cast<u32>(local_size) + sph.common3.shader_local_memory_crs_size; 323 local_memory_size = static_cast<u32>(local_size) + sph.common3.shader_local_memory_crs_size;
324 texture_bound = maxwell3d->regs.bindless_texture_const_buffer_slot; 324 texture_bound = maxwell3d->regs.bindless_texture_const_buffer_slot;
325 is_propietary_driver = texture_bound == 2; 325 is_proprietary_driver = texture_bound == 2;
326 has_hle_engine_state = 326 has_hle_engine_state =
327 maxwell3d->engine_state == Tegra::Engines::Maxwell3D::EngineHint::OnHLEMacro; 327 maxwell3d->engine_state == Tegra::Engines::Maxwell3D::EngineHint::OnHLEMacro;
328} 328}
@@ -404,7 +404,7 @@ ComputeEnvironment::ComputeEnvironment(Tegra::Engines::KeplerCompute& kepler_com
404 stage = Shader::Stage::Compute; 404 stage = Shader::Stage::Compute;
405 local_memory_size = qmd.local_pos_alloc + qmd.local_crs_alloc; 405 local_memory_size = qmd.local_pos_alloc + qmd.local_crs_alloc;
406 texture_bound = kepler_compute->regs.tex_cb_index; 406 texture_bound = kepler_compute->regs.tex_cb_index;
407 is_propietary_driver = texture_bound == 2; 407 is_proprietary_driver = texture_bound == 2;
408 shared_memory_size = qmd.shared_alloc; 408 shared_memory_size = qmd.shared_alloc;
409 workgroup_size = {qmd.block_dim_x, qmd.block_dim_y, qmd.block_dim_z}; 409 workgroup_size = {qmd.block_dim_x, qmd.block_dim_y, qmd.block_dim_z};
410} 410}
@@ -509,7 +509,7 @@ void FileEnvironment::Deserialize(std::ifstream& file) {
509 file.read(reinterpret_cast<char*>(&gp_passthrough_mask), sizeof(gp_passthrough_mask)); 509 file.read(reinterpret_cast<char*>(&gp_passthrough_mask), sizeof(gp_passthrough_mask));
510 } 510 }
511 } 511 }
512 is_propietary_driver = texture_bound == 2; 512 is_proprietary_driver = texture_bound == 2;
513} 513}
514 514
515void FileEnvironment::Dump(u64 pipeline_hash, u64 shader_hash) { 515void FileEnvironment::Dump(u64 pipeline_hash, u64 shader_hash) {
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h
index 701817086..a2ec26697 100644
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -596,7 +596,7 @@ public:
596 } 596 }
597 597
598 /// Returns true when the device does not properly support cube compatibility. 598 /// Returns true when the device does not properly support cube compatibility.
599 bool HasBrokenCubeImageCompability() const { 599 bool HasBrokenCubeImageCompatibility() const {
600 return has_broken_cube_compatibility; 600 return has_broken_cube_compatibility;
601 } 601 }
602 602
diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp
index 8dd1667f3..8f4a57e3c 100644
--- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp
+++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp
@@ -57,7 +57,7 @@ struct Range {
57 return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; 57 return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
58} 58}
59 59
60[[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferedVmaFlags(MemoryUsage usage) { 60[[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferredVmaFlags(MemoryUsage usage) {
61 return usage != MemoryUsage::DeviceLocal ? VK_MEMORY_PROPERTY_HOST_COHERENT_BIT 61 return usage != MemoryUsage::DeviceLocal ? VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
62 : VkMemoryPropertyFlagBits{}; 62 : VkMemoryPropertyFlagBits{};
63} 63}
@@ -256,7 +256,7 @@ vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo& ci, MemoryUsa
256 .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage), 256 .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage),
257 .usage = MemoryUsageVma(usage), 257 .usage = MemoryUsageVma(usage),
258 .requiredFlags = 0, 258 .requiredFlags = 0,
259 .preferredFlags = MemoryUsagePreferedVmaFlags(usage), 259 .preferredFlags = MemoryUsagePreferredVmaFlags(usage),
260 .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types, 260 .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
261 .pool = VK_NULL_HANDLE, 261 .pool = VK_NULL_HANDLE,
262 .pUserData = nullptr, 262 .pUserData = nullptr,