diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-04-23 00:50:56 +0200 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-04-23 00:50:56 +0200 |
commit | a91d3fc6397560fc6294a24faeed73d45abd1753 (patch) | |
tree | 5f33a0964c33e3ce54520f74d72c0117a5770b15 /src/video_core/engines/kepler_memory.h | |
parent | Merge pull request #2403 from FernandoS27/compressed-linear (diff) | |
download | yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.tar yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.tar.gz yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.tar.bz2 yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.tar.lz yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.tar.xz yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.tar.zst yuzu-a91d3fc6397560fc6294a24faeed73d45abd1753.zip |
Diffstat (limited to 'src/video_core/engines/kepler_memory.h')
-rw-r--r-- | src/video_core/engines/kepler_memory.h | 60 |
1 files changed, 5 insertions, 55 deletions
diff --git a/src/video_core/engines/kepler_memory.h b/src/video_core/engines/kepler_memory.h index 5f892ddad..c6b738eb9 100644 --- a/src/video_core/engines/kepler_memory.h +++ b/src/video_core/engines/kepler_memory.h @@ -10,6 +10,7 @@ #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" +#include "video_core/engines/engine_upload.h" #include "video_core/gpu.h" namespace Core { @@ -20,10 +21,6 @@ namespace Tegra { class MemoryManager; } -namespace VideoCore { -class RasterizerInterface; -} - namespace Tegra::Engines { #define KEPLERMEMORY_REG_INDEX(field_name) \ @@ -31,8 +28,7 @@ namespace Tegra::Engines { class KeplerMemory final { public: - KeplerMemory(Core::System& system, VideoCore::RasterizerInterface& rasterizer, - MemoryManager& memory_manager); + KeplerMemory(Core::System& system, MemoryManager& memory_manager); ~KeplerMemory(); /// Write the value to the register identified by method. @@ -45,42 +41,7 @@ public: struct { INSERT_PADDING_WORDS(0x60); - u32 line_length_in; - u32 line_count; - - struct { - u32 address_high; - u32 address_low; - u32 pitch; - union { - BitField<0, 4, u32> block_width; - BitField<4, 4, u32> block_height; - BitField<8, 4, u32> block_depth; - }; - u32 width; - u32 height; - u32 depth; - u32 z; - u32 x; - u32 y; - - GPUVAddr Address() const { - return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) | - address_low); - } - - u32 BlockWidth() const { - return 1U << block_width.Value(); - } - - u32 BlockHeight() const { - return 1U << block_height.Value(); - } - - u32 BlockDepth() const { - return 1U << block_depth.Value(); - } - } dest; + Upload::Data upload; struct { union { @@ -96,28 +57,17 @@ public: }; } regs{}; - struct { - u32 write_offset = 0; - u32 copy_size = 0; - std::vector<u8> inner_buffer; - } state{}; - private: Core::System& system; - VideoCore::RasterizerInterface& rasterizer; MemoryManager& memory_manager; - - void ProcessExec(); - void ProcessData(u32 data, bool is_last_call); + Upload::State upload_state; }; #define ASSERT_REG_POSITION(field_name, position) \ static_assert(offsetof(KeplerMemory::Regs, field_name) == position * 4, \ "Field " #field_name " has invalid position") -ASSERT_REG_POSITION(line_length_in, 0x60); -ASSERT_REG_POSITION(line_count, 0x61); -ASSERT_REG_POSITION(dest, 0x62); +ASSERT_REG_POSITION(upload, 0x60); ASSERT_REG_POSITION(exec, 0x6C); ASSERT_REG_POSITION(data, 0x6D); #undef ASSERT_REG_POSITION |