Merge branch 'master' into BGRA8-Framebuffer-Format

This reverts commit 865387f3c3.

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

@@ -18,6 +18,7 @@ namespace Tegra {
 u32 FramebufferConfig::BytesPerPixel(PixelFormat format) {
     switch (format) {
     case PixelFormat::ABGR8:
+    case PixelFormat::RGB565:
     case PixelFormat::BGRA8:
         return 4;
     default:

src/video_core/gpu.h

@@ -80,6 +80,7 @@ class DebugContext;
 struct FramebufferConfig {
     enum class PixelFormat : u32 {
         ABGR8 = 1,
+        RGB565 = 4,
         BGRA8 = 5,
     };
 

src/video_core/renderer_opengl/renderer_opengl.cpp

@@ -266,6 +266,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,
         texture.gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
         gl_framebuffer_data.resize(texture.width * texture.height * 4);
         break;
+    case Tegra::FramebufferConfig::PixelFormat::RGB565:
+        internal_format = GL_RGB;
+        texture.gl_format = GL_RGB;
+        texture.gl_type = GL_UNSIGNED_SHORT_5_6_5;
+        gl_framebuffer_data.resize(texture.width * texture.height * 4);
+        break;
     default:
         internal_format = GL_RGBA8;
         texture.gl_format = GL_RGBA;