summaryrefslogtreecommitdiffstats
path: root/src/video_core/engines
diff options
context:
space:
mode:
authorViktor Szépe <viktor@szepe.net>2024-01-07 23:44:55 +0100
committerViktor Szépe <viktor@szepe.net>2024-01-07 23:44:55 +0100
commit53085a45e0b2cc995f4056de40116a66f7ae7c08 (patch)
tree532a7e9b391510ea4e9fb254d669b405de7b289d /src/video_core/engines
parentMerge pull request #12560 from GayPotatoEmma/master (diff)
downloadyuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.gz
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.bz2
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.lz
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.xz
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.tar.zst
yuzu-53085a45e0b2cc995f4056de40116a66f7ae7c08.zip
Diffstat (limited to 'src/video_core/engines')
-rw-r--r--src/video_core/engines/maxwell_3d.h10
-rw-r--r--src/video_core/engines/sw_blitter/blitter.cpp8
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:
enum class ClearReport : u32 {
ZPassPixelCount = 0x01,
ZCullStats = 0x02,
- StreamingPrimitvesNeededMinusSucceeded = 0x03,
+ StreamingPrimitivesNeededMinusSucceeded = 0x03,
AlphaBetaClocks = 0x04,
StreamingPrimitivesSucceeded = 0x10,
StreamingPrimitivesNeeded = 0x11,
@@ -2383,8 +2383,8 @@ public:
};
enum class Release : u32 {
- AfterAllPreceedingReads = 0,
- AfterAllPreceedingWrites = 1,
+ AfterAllPrecedingReads = 0,
+ AfterAllPrecedingWrites = 1,
};
enum class Acquire : u32 {
@@ -2869,7 +2869,7 @@ public:
u32 global_base_instance_index; ///< 0x1438
INSERT_PADDING_BYTES_NOINIT(0x14);
RegisterWatermarks ps_warp_watermarks; ///< 0x1450
- RegisterWatermarks ps_regster_watermarks; ///< 0x1454
+ RegisterWatermarks ps_register_watermarks; ///< 0x1454
INSERT_PADDING_BYTES_NOINIT(0xC);
u32 store_zcull; ///< 0x1464
INSERT_PADDING_BYTES_NOINIT(0x18);
@@ -3444,7 +3444,7 @@ ASSERT_REG_POSITION(invalidate_texture_header_cache_no_wfi, 0x1428);
ASSERT_REG_POSITION(global_base_vertex_index, 0x1434);
ASSERT_REG_POSITION(global_base_instance_index, 0x1438);
ASSERT_REG_POSITION(ps_warp_watermarks, 0x1450);
-ASSERT_REG_POSITION(ps_regster_watermarks, 0x1454);
+ASSERT_REG_POSITION(ps_register_watermarks, 0x1454);
ASSERT_REG_POSITION(store_zcull, 0x1464);
ASSERT_REG_POSITION(iterated_blend_constants, 0x1480);
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,
const bool no_passthrough =
src.format != dst.format || src_extent_x != dst_extent_x || src_extent_y != dst_extent_y;
- const auto convertion_phase_same_format = [&]() {
+ const auto conversion_phase_same_format = [&]() {
NearestNeighbor(impl->src_buffer, impl->dst_buffer, src_extent_x, src_extent_y,
dst_extent_x, dst_extent_y, dst_bytes_per_pixel);
};
- const auto convertion_phase_ir = [&]() {
+ const auto conversion_phase_ir = [&]() {
auto* input_converter = impl->converter_factory.GetFormatConverter(src.format);
impl->intermediate_src.resize_destructive((src_copy_size / src_bytes_per_pixel) *
ir_components);
@@ -211,9 +211,9 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst,
// Conversion Phase
if (no_passthrough) {
if (src.format != dst.format || config.filter == Fermi2D::Filter::Bilinear) {
- convertion_phase_ir();
+ conversion_phase_ir();
} else {
- convertion_phase_same_format();
+ conversion_phase_same_format();
}
} else {
impl->dst_buffer.swap(impl->src_buffer);