diff options
| author | 2022-06-16 02:12:21 +0200 | |
|---|---|---|
| committer | 2022-10-06 21:00:53 +0200 | |
| commit | fe24c65153349d3a759a2eef02ec703851a96847 (patch) | |
| tree | 68148597dbb554d427ce43a660c88c28fc9545bb /src/video_core/host1x | |
| parent | Common: Fix variable shadowing. (diff) | |
| download | yuzu-fe24c65153349d3a759a2eef02ec703851a96847.tar.gz yuzu-fe24c65153349d3a759a2eef02ec703851a96847.tar.xz yuzu-fe24c65153349d3a759a2eef02ec703851a96847.zip | |
General: Fix clang format.
Diffstat (limited to 'src/video_core/host1x')
| -rw-r--r-- | src/video_core/host1x/codecs/vp9.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/host1x/syncpoint_manager.h | 4 | ||||
| -rw-r--r-- | src/video_core/host1x/vic.cpp | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/video_core/host1x/codecs/vp9.cpp b/src/video_core/host1x/codecs/vp9.cpp index 667aadc6a..cf40c9012 100644 --- a/src/video_core/host1x/codecs/vp9.cpp +++ b/src/video_core/host1x/codecs/vp9.cpp | |||
| @@ -382,8 +382,9 @@ Vp9FrameContainer VP9::GetCurrentFrame(const Host1x::NvdecCommon::NvdecRegisters | |||
| 382 | // gpu.SyncGuestHost(); epic, why? | 382 | // gpu.SyncGuestHost(); epic, why? |
| 383 | current_frame.info = GetVp9PictureInfo(state); | 383 | current_frame.info = GetVp9PictureInfo(state); |
| 384 | current_frame.bit_stream.resize(current_frame.info.bitstream_size); | 384 | current_frame.bit_stream.resize(current_frame.info.bitstream_size); |
| 385 | host1x.MemoryManager().ReadBlock(state.frame_bitstream_offset, current_frame.bit_stream.data(), | 385 | host1x.MemoryManager().ReadBlock(state.frame_bitstream_offset, |
| 386 | current_frame.info.bitstream_size); | 386 | current_frame.bit_stream.data(), |
| 387 | current_frame.info.bitstream_size); | ||
| 387 | } | 388 | } |
| 388 | if (!next_frame.bit_stream.empty()) { | 389 | if (!next_frame.bit_stream.empty()) { |
| 389 | Vp9FrameContainer temp{ | 390 | Vp9FrameContainer temp{ |
diff --git a/src/video_core/host1x/syncpoint_manager.h b/src/video_core/host1x/syncpoint_manager.h index 0ecc040ab..440b1508a 100644 --- a/src/video_core/host1x/syncpoint_manager.h +++ b/src/video_core/host1x/syncpoint_manager.h | |||
| @@ -49,9 +49,9 @@ public: | |||
| 49 | expected_value, func); | 49 | expected_value, func); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | void DeregisterGuestAction(u32 syncpoint_id,ActionHandle& handle); | 52 | void DeregisterGuestAction(u32 syncpoint_id, ActionHandle& handle); |
| 53 | 53 | ||
| 54 | void DeregisterHostAction(u32 syncpoint_id,ActionHandle& handle); | 54 | void DeregisterHostAction(u32 syncpoint_id, ActionHandle& handle); |
| 55 | 55 | ||
| 56 | void IncrementGuest(u32 syncpoint_id); | 56 | void IncrementGuest(u32 syncpoint_id); |
| 57 | 57 | ||
diff --git a/src/video_core/host1x/vic.cpp b/src/video_core/host1x/vic.cpp index b9ac41529..ac0b7d20e 100644 --- a/src/video_core/host1x/vic.cpp +++ b/src/video_core/host1x/vic.cpp | |||
| @@ -157,8 +157,8 @@ void Vic::WriteRGBFrame(const AVFrame* frame, const VicConfig& config) { | |||
| 157 | const auto size = Texture::CalculateSize(true, 4, width, height, 1, block_height, 0); | 157 | const auto size = Texture::CalculateSize(true, 4, width, height, 1, block_height, 0); |
| 158 | luma_buffer.resize(size); | 158 | luma_buffer.resize(size); |
| 159 | std::span<const u8> frame_buff(converted_frame_buf_addr, 4 * width * height); | 159 | std::span<const u8> frame_buff(converted_frame_buf_addr, 4 * width * height); |
| 160 | Texture::SwizzleSubrect(luma_buffer, frame_buff, 4, width, height, 1, | 160 | Texture::SwizzleSubrect(luma_buffer, frame_buff, 4, width, height, 1, 0, 0, width, height, |
| 161 | 0, 0, width, height, block_height, 0, width * 4); | 161 | block_height, 0, width * 4); |
| 162 | 162 | ||
| 163 | host1x.MemoryManager().WriteBlock(output_surface_luma_address, luma_buffer.data(), size); | 163 | host1x.MemoryManager().WriteBlock(output_surface_luma_address, luma_buffer.data(), size); |
| 164 | } else { | 164 | } else { |