From 666d53299c9cc61d88c0a4ed32cebd7cbbb5b712 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 25 Mar 2018 17:57:53 -0400
Subject: [PATCH] graphics_surface: Fix merge conflicts.

---
 src/video_core/gpu.h                            | 1 +
 src/yuzu/debugger/graphics/graphics_surface.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index ab24504a63..71a8661b4c 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -14,6 +14,7 @@
 namespace Tegra {
 
 enum class RenderTargetFormat : u32 {
+    NONE = 0x0,
     RGBA8_UNORM = 0xD5,
 };
 
diff --git a/src/yuzu/debugger/graphics/graphics_surface.cpp b/src/yuzu/debugger/graphics/graphics_surface.cpp
index 8e6509adc5..7ea08c23fc 100644
--- a/src/yuzu/debugger/graphics/graphics_surface.cpp
+++ b/src/yuzu/debugger/graphics/graphics_surface.cpp
@@ -339,9 +339,9 @@ void GraphicsSurfaceWidget::OnUpdate() {
                                 static_cast<size_t>(Source::RenderTarget0)];
 
         surface_address = rt.Address();
-        surface_width = rt.horiz;
-        surface_height = rt.vert;
-        if (rt.format != 0) {
+        surface_width = rt.width;
+        surface_height = rt.height;
+        if (rt.format != Tegra::RenderTargetFormat::NONE) {
             surface_format =
                 ConvertToTextureFormat(static_cast<Tegra::RenderTargetFormat>(rt.format));
         }