diff options
| author | 2018-08-11 14:10:55 -0400 | |
|---|---|---|
| committer | 2018-08-11 14:10:55 -0400 | |
| commit | d64303d185f86901d0f587faf0e9a65d8497169c (patch) | |
| tree | 27e105a3534a2a92d2ea6468dab723cc156118fa /src/video_core/gpu.cpp | |
| parent | Merge pull request #1003 from lioncash/var (diff) | |
| parent | video_core; Get rid of global g_toggle_framelimit_enabled variable (diff) | |
| download | yuzu-d64303d185f86901d0f587faf0e9a65d8497169c.tar.gz yuzu-d64303d185f86901d0f587faf0e9a65d8497169c.tar.xz yuzu-d64303d185f86901d0f587faf0e9a65d8497169c.zip | |
Merge pull request #1016 from lioncash/video
video_core: Get rid of global variable g_toggle_framelimit_enabled
Diffstat (limited to 'src/video_core/gpu.cpp')
| -rw-r--r-- | src/video_core/gpu.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index b90937d17..ceaf86654 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/assert.h" | ||
| 5 | #include "video_core/engines/fermi_2d.h" | 6 | #include "video_core/engines/fermi_2d.h" |
| 6 | #include "video_core/engines/maxwell_3d.h" | 7 | #include "video_core/engines/maxwell_3d.h" |
| 7 | #include "video_core/engines/maxwell_compute.h" | 8 | #include "video_core/engines/maxwell_compute.h" |
| @@ -11,6 +12,15 @@ | |||
| 11 | 12 | ||
| 12 | namespace Tegra { | 13 | namespace Tegra { |
| 13 | 14 | ||
| 15 | u32 FramebufferConfig::BytesPerPixel(PixelFormat format) { | ||
| 16 | switch (format) { | ||
| 17 | case PixelFormat::ABGR8: | ||
| 18 | return 4; | ||
| 19 | } | ||
| 20 | |||
| 21 | UNREACHABLE(); | ||
| 22 | } | ||
| 23 | |||
| 14 | GPU::GPU(VideoCore::RasterizerInterface& rasterizer) { | 24 | GPU::GPU(VideoCore::RasterizerInterface& rasterizer) { |
| 15 | memory_manager = std::make_unique<MemoryManager>(); | 25 | memory_manager = std::make_unique<MemoryManager>(); |
| 16 | maxwell_3d = std::make_unique<Engines::Maxwell3D>(rasterizer, *memory_manager); | 26 | maxwell_3d = std::make_unique<Engines::Maxwell3D>(rasterizer, *memory_manager); |