diff options
| author | 2018-03-23 23:30:48 -0400 | |
|---|---|---|
| committer | 2018-03-23 23:30:48 -0400 | |
| commit | a10baacf9e5ab48af7fb0ccbdc75371c9287d3ba (patch) | |
| tree | 9ed56f99b9d2564f9250d3754e429eb0c8b43323 /src/core/hle/service | |
| parent | Merge pull request #255 from Subv/sd_card (diff) | |
| parent | gl_rasterizer: Fake render in green, because it's cooler. (diff) | |
| download | yuzu-a10baacf9e5ab48af7fb0ccbdc75371c9287d3ba.tar.gz yuzu-a10baacf9e5ab48af7fb0ccbdc75371c9287d3ba.tar.xz yuzu-a10baacf9e5ab48af7fb0ccbdc75371c9287d3ba.zip | |
Merge pull request #265 from bunnei/tegra-progress-2
Tegra progress 2
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp | 11 | ||||
| -rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp index 94530724e..87b3a2d74 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp | |||
| @@ -26,14 +26,13 @@ void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u3 | |||
| 26 | "Drawing from address %lx offset %08X Width %u Height %u Stride %u Format %u", addr, | 26 | "Drawing from address %lx offset %08X Width %u Height %u Stride %u Format %u", addr, |
| 27 | offset, width, height, stride, format); | 27 | offset, width, height, stride, format); |
| 28 | 28 | ||
| 29 | using PixelFormat = RendererBase::FramebufferInfo::PixelFormat; | 29 | using PixelFormat = Tegra::FramebufferConfig::PixelFormat; |
| 30 | using Flags = NVFlinger::BufferQueue::BufferTransformFlags; | 30 | const Tegra::FramebufferConfig framebuffer{ |
| 31 | const bool flip_vertical = static_cast<u32>(transform) & static_cast<u32>(Flags::FlipV); | 31 | addr, offset, width, height, stride, static_cast<PixelFormat>(format), transform}; |
| 32 | const RendererBase::FramebufferInfo framebuffer_info{ | ||
| 33 | addr, offset, width, height, stride, static_cast<PixelFormat>(format), flip_vertical}; | ||
| 34 | 32 | ||
| 35 | Core::System::GetInstance().perf_stats.EndGameFrame(); | 33 | Core::System::GetInstance().perf_stats.EndGameFrame(); |
| 36 | VideoCore::g_renderer->SwapBuffers(framebuffer_info); | 34 | |
| 35 | VideoCore::g_renderer->SwapBuffers(framebuffer); | ||
| 37 | } | 36 | } |
| 38 | 37 | ||
| 39 | } // namespace Devices | 38 | } // namespace Devices |
diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h index 686eadca7..1de5767cb 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.h +++ b/src/core/hle/service/nvflinger/buffer_queue.h | |||
| @@ -47,6 +47,8 @@ public: | |||
| 47 | ~BufferQueue() = default; | 47 | ~BufferQueue() = default; |
| 48 | 48 | ||
| 49 | enum class BufferTransformFlags : u32 { | 49 | enum class BufferTransformFlags : u32 { |
| 50 | /// No transform flags are set | ||
| 51 | Unset = 0x00, | ||
| 50 | /// Flip source image horizontally (around the vertical axis) | 52 | /// Flip source image horizontally (around the vertical axis) |
| 51 | FlipH = 0x01, | 53 | FlipH = 0x01, |
| 52 | /// Flip source image vertically (around the horizontal axis) | 54 | /// Flip source image vertically (around the horizontal axis) |