From 60157170cbdc6b497ccfa119e03f331fd472d536 Mon Sep 17 00:00:00 2001
From: greggameplayer <gregoire.hage@gmail.com>
Date: Sat, 9 Feb 2019 23:50:39 +0100
Subject: [PATCH] Revert "Implement RGB565 Framebuffer format"

This reverts commit 865387f3c36bc8771b27845524e73c526473b949.

Conflicts:
	src/video_core/gpu.h
	src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
	src/video_core/surface.cpp
---
 src/video_core/gpu.cpp                        |  2 -
 .../renderer_opengl/gl_rasterizer_cache.cpp   |  1 -
 src/video_core/surface.h                      | 39 ++++++++-----------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index b2ff1feba8..08cf6268fc 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -17,8 +17,6 @@ u32 FramebufferConfig::BytesPerPixel(PixelFormat format) {
     switch (format) {
     case PixelFormat::ABGR8:
         return 4;
-    case PixelFormat::RGB565:
-        return 2;
     default:
         return 4;
     }
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 3349e52257..bff0c65cde 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -324,7 +324,6 @@ static constexpr std::array<FormatTuple, VideoCore::Surface::MaxPixelFormat> tex
     {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false},        // ASTC_2D_8X5
     {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false},        // ASTC_2D_5X4
     {GL_SRGB8_ALPHA8, GL_BGRA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false}, // BGRA8
-    {GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, ComponentType::UNorm, false}, // RGB565U
     // Compressed sRGB formats
     {GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, ComponentType::UNorm,
      true}, // DXT1_SRGB
diff --git a/src/video_core/surface.h b/src/video_core/surface.h
index 88b6a45365..c2259c3c2b 100644
--- a/src/video_core/surface.h
+++ b/src/video_core/surface.h
@@ -62,32 +62,31 @@ enum class PixelFormat {
     ASTC_2D_8X5 = 44,
     ASTC_2D_5X4 = 45,
     BGRA8_SRGB = 46,
-    RGB565U = 47,
-    DXT1_SRGB = 48,
-    DXT23_SRGB = 49,
-    DXT45_SRGB = 50,
-    BC7U_SRGB = 51,
-    ASTC_2D_4X4_SRGB = 52,
-    ASTC_2D_8X8_SRGB = 53,
-    ASTC_2D_8X5_SRGB = 54,
-    ASTC_2D_5X4_SRGB = 55,
-    ASTC_2D_5X5 = 56,
-    ASTC_2D_5X5_SRGB = 57,
-    ASTC_2D_10X8 = 58,
-    ASTC_2D_10X8_SRGB = 59,
+    DXT1_SRGB = 47,
+    DXT23_SRGB = 48,
+    DXT45_SRGB = 49,
+    BC7U_SRGB = 50,
+    ASTC_2D_4X4_SRGB = 51,
+    ASTC_2D_8X8_SRGB = 52,
+    ASTC_2D_8X5_SRGB = 53,
+    ASTC_2D_5X4_SRGB = 54,
+    ASTC_2D_5X5 = 55,
+    ASTC_2D_5X5_SRGB = 56,
+    ASTC_2D_10X8 = 57,
+    ASTC_2D_10X8_SRGB = 58,
 
     MaxColorFormat,
 
     // Depth formats
-    Z32F = 60,
-    Z16 = 61,
+    Z32F = 59,
+    Z16 = 60,
 
     MaxDepthFormat,
 
     // DepthStencil formats
-    Z24S8 = 62,
-    S8Z24 = 63,
-    Z32FS8 = 64,
+    Z24S8 = 61,
+    S8Z24 = 62,
+    Z32FS8 = 63,
 
     MaxDepthStencilFormat,
 
@@ -172,7 +171,6 @@ constexpr std::array<u32, MaxPixelFormat> compression_factor_table = {{
     4, // ASTC_2D_8X5
     4, // ASTC_2D_5X4
     1, // BGRA8_SRGB
-    1, // RGB565U
     4, // DXT1_SRGB
     4, // DXT23_SRGB
     4, // DXT45_SRGB
@@ -254,7 +252,6 @@ constexpr std::array<u32, MaxPixelFormat> block_width_table = {{
     8,  // ASTC_2D_8X5
     5,  // ASTC_2D_5X4
     1,  // BGRA8_SRGB
-    1,  // RGB565U
     4,  // DXT1_SRGB
     4,  // DXT23_SRGB
     4,  // DXT45_SRGB
@@ -330,7 +327,6 @@ constexpr std::array<u32, MaxPixelFormat> block_height_table = {{
     5, // ASTC_2D_8X5
     4, // ASTC_2D_5X4
     1, // BGRA8_SRGB
-    1, // RGB565U
     4, // DXT1_SRGB
     4, // DXT23_SRGB
     4, // DXT45_SRGB
@@ -406,7 +402,6 @@ constexpr std::array<u32, MaxPixelFormat> bpp_table = {{
     128, // ASTC_2D_8X5
     128, // ASTC_2D_5X4
     32,  // BGRA8_SRGB
-    16,  // RGB565U
     64,  // DXT1_SRGB
     128, // DXT23_SRGB
     128, // DXT45_SRGB