nintendo-back-up/yuzu
1
0
Fork 0
mirror of https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu.git synced 2025-05-12 00:45:25 +00:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

graphics_surface: Fix merge conflicts.

Browse Source
This commit is contained in:
bunnei 2018-03-25 17:57:53 -04:00
parent ac19e3d061
commit 666d53299c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video_core/gpu.h
View File

@ -14,6 +14,7 @@
namespace Tegra { namespace Tegra {
enum class RenderTargetFormat : u32 { enum class RenderTargetFormat : u32 {
NONE = 0x0,
RGBA8_UNORM = 0xD5, RGBA8_UNORM = 0xD5,
}; };

6
src/yuzu/debugger/graphics/graphics_surface.cpp
View File

@ -339,9 +339,9 @@ void GraphicsSurfaceWidget::OnUpdate() {
static_cast<size_t>(Source::RenderTarget0)]; static_cast<size_t>(Source::RenderTarget0)];
surface_address = rt.Address(); surface_address = rt.Address();
surface_width = rt.horiz; surface_width = rt.width;
surface_height = rt.vert; surface_height = rt.height;
if (rt.format != 0) { if (rt.format != Tegra::RenderTargetFormat::NONE) {
surface_format = surface_format =
ConvertToTextureFormat(static_cast<Tegra::RenderTargetFormat>(rt.format)); ConvertToTextureFormat(static_cast<Tegra::RenderTargetFormat>(rt.format));
} }