From 5abf93266e971de43deb9535848841436fd4ffa9 Mon Sep 17 00:00:00 2001 From: greggameplayer Date: Sat, 9 Feb 2019 23:47:46 +0100 Subject: [PATCH] Revert "Implement BGRA8 framebuffer format" This reverts commit f6e998f6ad8ae8a83d7e1c45d1533eb0254bc346. Conflicts: src/video_core/gpu.h src/video_core/surface.cpp --- src/video_core/gpu.cpp | 1 - src/video_core/gpu.h | 1 - src/video_core/surface.cpp | 4 ---- 3 files changed, 6 deletions(-) diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index dfd63eee59..b2ff1feba8 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -16,7 +16,6 @@ namespace Tegra { u32 FramebufferConfig::BytesPerPixel(PixelFormat format) { switch (format) { case PixelFormat::ABGR8: - case PixelFormat::BGRA8: return 4; case PixelFormat::RGB565: return 2; diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index b9af9d5e98..66f63ba717 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -81,7 +81,6 @@ struct FramebufferConfig { enum class PixelFormat : u32 { ABGR8 = 1, RGB565 = 4, - BGRA8 = 5, }; /** diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp index cc20751f70..1a344229f0 100644 --- a/src/video_core/surface.cpp +++ b/src/video_core/surface.cpp @@ -408,10 +408,6 @@ PixelFormat PixelFormatFromGPUPixelFormat(Tegra::FramebufferConfig::PixelFormat switch (format) { case Tegra::FramebufferConfig::PixelFormat::ABGR8: return PixelFormat::ABGR8U; - case Tegra::FramebufferConfig::PixelFormat::BGRA8: - return PixelFormat::BGRA8; - case Tegra::FramebufferConfig::PixelFormat::RGB565: - return PixelFormat::RGB565U; default: LOG_CRITICAL(HW_GPU, "Unimplemented format={}", static_cast(format)); UNREACHABLE();