From 71ebc3e90da9882139d2a5695ca1ed59ea77e94f Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Mon, 19 Mar 2018 18:00:29 -0500
Subject: GPU: Preliminary work for texture decoding.

---
 src/video_core/textures/texture.h | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/video_core/textures/texture.h

(limited to 'src/video_core/textures/texture.h')

diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h
new file mode 100644
index 000000000..3306d2ab2
--- /dev/null
+++ b/src/video_core/textures/texture.h
@@ -0,0 +1,57 @@
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "common/bit_field.h"
+#include "common/common_funcs.h"
+#include "common/common_types.h"
+#include "video_core/memory_manager.h"
+
+namespace Tegra {
+namespace Texture {
+
+enum class TextureFormat : u32 {
+    DXT1 = 0x24,
+};
+
+union TextureHandle {
+    u32 raw;
+    BitField<0, 20, u32> tic_id;
+    BitField<20, 12, u32> tsc_id;
+};
+
+struct TICEntry {
+    union {
+        u32 raw;
+        BitField<0, 7, TextureFormat> format;
+        BitField<7, 3, u32> r_type;
+        BitField<10, 3, u32> g_type;
+        BitField<13, 3, u32> b_type;
+        BitField<16, 3, u32> a_type;
+    };
+    u32 address_low;
+    u16 address_high;
+    INSERT_PADDING_BYTES(6);
+    u16 width_minus_1;
+    INSERT_PADDING_BYTES(2);
+    u16 height_minus_1;
+    INSERT_PADDING_BYTES(10);
+
+    GPUVAddr Address() const {
+        return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) | address_low);
+    }
+
+    u32 Width() const {
+        return width_minus_1 + 1;
+    }
+
+    u32 Height() const {
+        return height_minus_1 + 1;
+    }
+};
+static_assert(sizeof(TICEntry) == 0x20, "TICEntry has wrong size");
+
+} // namespace Texture
+} // namespace Tegra
-- 
cgit v1.2.3


From 1b8d798835c2d39c2867f53d8dcacdc7d0ba0d15 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Thu, 22 Mar 2018 15:17:10 -0500
Subject: GPU: Added a method to unswizzle a texture without decoding it.

Allow unswizzling of DXT1 textures.
---
 src/video_core/textures/texture.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/video_core/textures/texture.h')

diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h
index 3306d2ab2..d969bcdd9 100644
--- a/src/video_core/textures/texture.h
+++ b/src/video_core/textures/texture.h
@@ -13,6 +13,7 @@ namespace Tegra {
 namespace Texture {
 
 enum class TextureFormat : u32 {
+    A8R8G8B8 = 8,
     DXT1 = 0x24,
 };
 
@@ -53,5 +54,8 @@ struct TICEntry {
 };
 static_assert(sizeof(TICEntry) == 0x20, "TICEntry has wrong size");
 
+/// Returns the number of bytes per pixel of the input texture format.
+u32 BytesPerPixel(TextureFormat format);
+
 } // namespace Texture
 } // namespace Tegra
-- 
cgit v1.2.3