diff options
| author |  bunnei | 2018-03-25 17:57:53 -0400 |
|---|---|---|
| committer | bunnei | 2018-03-26 21:17:03 -0400 |
| commit | 666d53299c9cc61d88c0a4ed32cebd7cbbb5b712 (patch) | |
| tree | 7de593df28f84a2c97e1b79a067ae3ac98a224f2 /src/video_core/gpu.h | |
| parent | gl_rasterizer: Use ReadBlock instead of GetPointer for SetupVertexArray. (diff) | |
| download | yuzu-666d53299c9cc61d88c0a4ed32cebd7cbbb5b712.tar.gz yuzu-666d53299c9cc61d88c0a4ed32cebd7cbbb5b712.tar.xz yuzu-666d53299c9cc61d88c0a4ed32cebd7cbbb5b712.zip | |
graphics_surface: Fix merge conflicts.
Diffstat (limited to 'src/video_core/gpu.h')
| -rw-r--r-- | src/video_core/gpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index ab24504a6..71a8661b4 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | namespace Tegra { | 14 | namespace Tegra { |
| 15 | 15 | ||
| 16 | enum class RenderTargetFormat : u32 { | 16 | enum class RenderTargetFormat : u32 { |
| 17 | NONE = 0x0, | ||
| 17 | RGBA8_UNORM = 0xD5, | 18 | RGBA8_UNORM = 0xD5, |
| 18 | }; | 19 | }; |
| 19 | 20 | ||