diff options
| author | 2019-05-11 00:38:35 -0400 | |
|---|---|---|
| committer | 2019-06-20 21:36:12 -0300 | |
| commit | 6bd034eae9ab48c00e1635e2d7059b3d99b764b0 (patch) | |
| tree | 13e6df7b58879fc5480e329c63b2cef01c6ffde1 /src | |
| parent | surface_params: Optimize CreateForTexture (diff) | |
| download | yuzu-6bd034eae9ab48c00e1635e2d7059b3d99b764b0.tar.gz yuzu-6bd034eae9ab48c00e1635e2d7059b3d99b764b0.tar.xz yuzu-6bd034eae9ab48c00e1635e2d7059b3d99b764b0.zip | |
engine_upload: Addapt to new Texture Cache
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/engines/engine_upload.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/engines/engine_upload.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/engines/engine_upload.cpp b/src/video_core/engines/engine_upload.cpp index 082a40cd9..c776b9a56 100644 --- a/src/video_core/engines/engine_upload.cpp +++ b/src/video_core/engines/engine_upload.cpp | |||
| @@ -36,8 +36,8 @@ void State::ProcessData(const u32 data, const bool is_last_call) { | |||
| 36 | } else { | 36 | } else { |
| 37 | UNIMPLEMENTED_IF(regs.dest.z != 0); | 37 | UNIMPLEMENTED_IF(regs.dest.z != 0); |
| 38 | UNIMPLEMENTED_IF(regs.dest.depth != 1); | 38 | UNIMPLEMENTED_IF(regs.dest.depth != 1); |
| 39 | UNIMPLEMENTED_IF(regs.dest.BlockWidth() != 1); | 39 | UNIMPLEMENTED_IF(regs.dest.BlockWidth() != 0); |
| 40 | UNIMPLEMENTED_IF(regs.dest.BlockDepth() != 1); | 40 | UNIMPLEMENTED_IF(regs.dest.BlockDepth() != 0); |
| 41 | const std::size_t dst_size = Tegra::Texture::CalculateSize( | 41 | const std::size_t dst_size = Tegra::Texture::CalculateSize( |
| 42 | true, 1, regs.dest.width, regs.dest.height, 1, regs.dest.BlockHeight(), 1); | 42 | true, 1, regs.dest.width, regs.dest.height, 1, regs.dest.BlockHeight(), 1); |
| 43 | tmp_buffer.resize(dst_size); | 43 | tmp_buffer.resize(dst_size); |
diff --git a/src/video_core/engines/engine_upload.h b/src/video_core/engines/engine_upload.h index ef4f5839a..cb294aec3 100644 --- a/src/video_core/engines/engine_upload.h +++ b/src/video_core/engines/engine_upload.h | |||
| @@ -39,15 +39,15 @@ struct Registers { | |||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | u32 BlockWidth() const { | 41 | u32 BlockWidth() const { |
| 42 | return 1U << block_width.Value(); | 42 | return block_width; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | u32 BlockHeight() const { | 45 | u32 BlockHeight() const { |
| 46 | return 1U << block_height.Value(); | 46 | return block_height; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | u32 BlockDepth() const { | 49 | u32 BlockDepth() const { |
| 50 | return 1U << block_depth.Value(); | 50 | return block_depth; |
| 51 | } | 51 | } |
| 52 | } dest; | 52 | } dest; |
| 53 | }; | 53 | }; |