diff options
| author | bunnei <bunneidev@gmail.com> | 2018-03-25 17:57:53 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-03-26 21:17:03 -0400 |
| commit | 74c4739713f3d937577c071237a4bb007557bbf2 (patch) | |
| tree | 7de593df28f84a2c97e1b79a067ae3ac98a224f2 /src/yuzu/debugger/graphics | |
| parent | 7c376760c046e6da2cfc7e66baa311187775f643 (diff) | |
graphics_surface: Fix merge conflicts.
Diffstat (limited to 'src/yuzu/debugger/graphics')
| -rw-r--r-- | src/yuzu/debugger/graphics/graphics_surface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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)); } |