From eda37ff26b5c0a8b9f4e6237dbf8ace8ef82e042 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 1 Jul 2020 01:18:43 -0300
Subject: video_core: Fix DXT4 and RGB565

---
 src/video_core/morton.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/video_core/morton.cpp')

diff --git a/src/video_core/morton.cpp b/src/video_core/morton.cpp
index 7f239566a..0c3c9f12d 100644
--- a/src/video_core/morton.cpp
+++ b/src/video_core/morton.cpp
@@ -46,6 +46,7 @@ static constexpr ConversionArray morton_to_linear_fns = {
     MortonCopy<true, PixelFormat::ABGR8I>,
     MortonCopy<true, PixelFormat::ABGR8UI>,
     MortonCopy<true, PixelFormat::B5G6R5U>,
+    MortonCopy<true, PixelFormat::R5G6B5U>,
     MortonCopy<true, PixelFormat::B5G5R5A1U>,
     MortonCopy<true, PixelFormat::A2B10G10R10U>,
     MortonCopy<true, PixelFormat::A2B10G10R10UI>,
@@ -64,7 +65,8 @@ static constexpr ConversionArray morton_to_linear_fns = {
     MortonCopy<true, PixelFormat::DXT1>,
     MortonCopy<true, PixelFormat::DXT23>,
     MortonCopy<true, PixelFormat::DXT45>,
-    MortonCopy<true, PixelFormat::DXN1>,
+    MortonCopy<true, PixelFormat::DXN1UNORM>,
+    MortonCopy<true, PixelFormat::DXN1SNORM>,
     MortonCopy<true, PixelFormat::DXN2UNORM>,
     MortonCopy<true, PixelFormat::DXN2SNORM>,
     MortonCopy<true, PixelFormat::BC7U>,
@@ -138,6 +140,7 @@ static constexpr ConversionArray linear_to_morton_fns = {
     MortonCopy<false, PixelFormat::ABGR8I>,
     MortonCopy<false, PixelFormat::ABGR8UI>,
     MortonCopy<false, PixelFormat::B5G6R5U>,
+    MortonCopy<false, PixelFormat::R5G6B5U>,
     MortonCopy<false, PixelFormat::B5G5R5A1U>,
     MortonCopy<false, PixelFormat::A2B10G10R10U>,
     MortonCopy<false, PixelFormat::A2B10G10R10UI>,
@@ -156,7 +159,8 @@ static constexpr ConversionArray linear_to_morton_fns = {
     MortonCopy<false, PixelFormat::DXT1>,
     MortonCopy<false, PixelFormat::DXT23>,
     MortonCopy<false, PixelFormat::DXT45>,
-    MortonCopy<false, PixelFormat::DXN1>,
+    MortonCopy<false, PixelFormat::DXN1UNORM>,
+    MortonCopy<false, PixelFormat::DXN1SNORM>,
     MortonCopy<false, PixelFormat::DXN2UNORM>,
     MortonCopy<false, PixelFormat::DXN2SNORM>,
     MortonCopy<false, PixelFormat::BC7U>,
-- 
cgit v1.2.3