diff options
| author | 2024-01-07 22:44:55 +0000 | |
|---|---|---|
| committer | 2024-01-07 22:44:55 +0000 | |
| commit | 53085a45e0b2cc995f4056de40116a66f7ae7c08 (patch) | |
| tree | 532a7e9b391510ea4e9fb254d669b405de7b289d /src/video_core/engines | |
| parent | Merge pull request #12560 from GayPotatoEmma/master (diff) | |
| download | yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.gz yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.xz yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.zip | |
Fix typos in video_core
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/maxwell_3d.h | 10 | ||||
| -rw-r--r-- | src/video_core/engines/sw_blitter/blitter.cpp | 8 |
2 files changed, 9 insertions, 9 deletions
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); | |||
| 3444 | ASSERT_REG_POSITION(global_base_vertex_index, 0x1434); | 3444 | ASSERT_REG_POSITION(global_base_vertex_index, 0x1434); |
| 3445 | ASSERT_REG_POSITION(global_base_instance_index, 0x1438); | 3445 | ASSERT_REG_POSITION(global_base_instance_index, 0x1438); |
| 3446 | ASSERT_REG_POSITION(ps_warp_watermarks, 0x1450); | 3446 | ASSERT_REG_POSITION(ps_warp_watermarks, 0x1450); |
| 3447 | ASSERT_REG_POSITION(ps_regster_watermarks, 0x1454); | 3447 | ASSERT_REG_POSITION(ps_register_watermarks, 0x1454); |
| 3448 | ASSERT_REG_POSITION(store_zcull, 0x1464); | 3448 | ASSERT_REG_POSITION(store_zcull, 0x1464); |
| 3449 | ASSERT_REG_POSITION(iterated_blend_constants, 0x1480); | 3449 | ASSERT_REG_POSITION(iterated_blend_constants, 0x1480); |
| 3450 | ASSERT_REG_POSITION(load_zcull, 0x1500); | 3450 | ASSERT_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); |