diff options
| -rw-r--r-- | src/video_core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/video_core/compatible_formats.cpp | 162 | ||||
| -rw-r--r-- | src/video_core/compatible_formats.h | 32 |
3 files changed, 196 insertions, 0 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 2dc752aa9..21c46a567 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -3,6 +3,8 @@ add_library(video_core STATIC | |||
| 3 | buffer_cache/buffer_cache.h | 3 | buffer_cache/buffer_cache.h |
| 4 | buffer_cache/map_interval.cpp | 4 | buffer_cache/map_interval.cpp |
| 5 | buffer_cache/map_interval.h | 5 | buffer_cache/map_interval.h |
| 6 | compatible_formats.cpp | ||
| 7 | compatible_formats.h | ||
| 6 | dirty_flags.cpp | 8 | dirty_flags.cpp |
| 7 | dirty_flags.h | 9 | dirty_flags.h |
| 8 | dma_pusher.cpp | 10 | dma_pusher.cpp |
diff --git a/src/video_core/compatible_formats.cpp b/src/video_core/compatible_formats.cpp new file mode 100644 index 000000000..01e5c26ae --- /dev/null +++ b/src/video_core/compatible_formats.cpp | |||
| @@ -0,0 +1,162 @@ | |||
| 1 | // Copyright 2020 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include <array> | ||
| 6 | #include <bitset> | ||
| 7 | #include <cstddef> | ||
| 8 | |||
| 9 | #include "video_core/compatible_formats.h" | ||
| 10 | #include "video_core/surface.h" | ||
| 11 | |||
| 12 | namespace VideoCore::Surface { | ||
| 13 | |||
| 14 | namespace { | ||
| 15 | |||
| 16 | // Compatibility table taken from Table 3.X.2 in: | ||
| 17 | // https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_texture_view.txt | ||
| 18 | |||
| 19 | constexpr std::array VIEW_CLASS_128_BITS = { | ||
| 20 | PixelFormat::RGBA32F, | ||
| 21 | PixelFormat::RGBA32UI, | ||
| 22 | }; | ||
| 23 | // Missing formats: | ||
| 24 | // PixelFormat::RGBA32I | ||
| 25 | |||
| 26 | constexpr std::array VIEW_CLASS_96_BITS = { | ||
| 27 | PixelFormat::RGB32F, | ||
| 28 | }; | ||
| 29 | // Missing formats: | ||
| 30 | // PixelFormat::RGB32UI, | ||
| 31 | // PixelFormat::RGB32I, | ||
| 32 | |||
| 33 | constexpr std::array VIEW_CLASS_64_BITS = { | ||
| 34 | PixelFormat::RGBA16F, PixelFormat::RG32F, PixelFormat::RGBA16UI, PixelFormat::RG32UI, | ||
| 35 | PixelFormat::RGBA16U, PixelFormat::RGBA16F, PixelFormat::RGBA16S, | ||
| 36 | }; | ||
| 37 | // Missing formats: | ||
| 38 | // PixelFormat::RGBA16I | ||
| 39 | // PixelFormat::RG32I | ||
| 40 | |||
| 41 | // TODO: How should we handle 48 bits? | ||
| 42 | |||
| 43 | constexpr std::array VIEW_CLASS_32_BITS = { | ||
| 44 | PixelFormat::RG16F, PixelFormat::R11FG11FB10F, PixelFormat::R32F, | ||
| 45 | PixelFormat::A2B10G10R10U, PixelFormat::RG16UI, PixelFormat::R32UI, | ||
| 46 | PixelFormat::RG16I, PixelFormat::R32I, PixelFormat::ABGR8U, | ||
| 47 | PixelFormat::RG16, PixelFormat::ABGR8S, PixelFormat::RG16S, | ||
| 48 | PixelFormat::RGBA8_SRGB, PixelFormat::E5B9G9R9F, PixelFormat::BGRA8, | ||
| 49 | PixelFormat::BGRA8_SRGB, | ||
| 50 | }; | ||
| 51 | // Missing formats: | ||
| 52 | // PixelFormat::RGBA8UI | ||
| 53 | // PixelFormat::RGBA8I | ||
| 54 | // PixelFormat::RGB10_A2_UI | ||
| 55 | |||
| 56 | // TODO: How should we handle 24 bits? | ||
| 57 | |||
| 58 | constexpr std::array VIEW_CLASS_16_BITS = { | ||
| 59 | PixelFormat::R16F, PixelFormat::RG8UI, PixelFormat::R16UI, PixelFormat::R16I, | ||
| 60 | PixelFormat::RG8U, PixelFormat::R16U, PixelFormat::RG8S, PixelFormat::R16S, | ||
| 61 | }; | ||
| 62 | // Missing formats: | ||
| 63 | // PixelFormat::RG8I | ||
| 64 | |||
| 65 | constexpr std::array VIEW_CLASS_8_BITS = { | ||
| 66 | PixelFormat::R8UI, | ||
| 67 | PixelFormat::R8U, | ||
| 68 | }; | ||
| 69 | // Missing formats: | ||
| 70 | // PixelFormat::R8I | ||
| 71 | // PixelFormat::R8S | ||
| 72 | |||
| 73 | constexpr std::array VIEW_CLASS_RGTC1_RED = { | ||
| 74 | PixelFormat::DXN1, | ||
| 75 | }; | ||
| 76 | // Missing formats: | ||
| 77 | // COMPRESSED_SIGNED_RED_RGTC1 | ||
| 78 | |||
| 79 | constexpr std::array VIEW_CLASS_RGTC2_RG = { | ||
| 80 | PixelFormat::DXN2UNORM, | ||
| 81 | PixelFormat::DXN2SNORM, | ||
| 82 | }; | ||
| 83 | |||
| 84 | constexpr std::array VIEW_CLASS_BPTC_UNORM = { | ||
| 85 | PixelFormat::BC7U, | ||
| 86 | PixelFormat::BC7U_SRGB, | ||
| 87 | }; | ||
| 88 | |||
| 89 | constexpr std::array VIEW_CLASS_BPTC_FLOAT = { | ||
| 90 | PixelFormat::BC6H_SF16, | ||
| 91 | PixelFormat::BC6H_UF16, | ||
| 92 | }; | ||
| 93 | |||
| 94 | // Compatibility table taken from Table 4.X.1 in: | ||
| 95 | // https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_copy_image.txt | ||
| 96 | |||
| 97 | constexpr std::array COPY_CLASS_128_BITS = { | ||
| 98 | PixelFormat::RGBA32UI, PixelFormat::RGBA32F, PixelFormat::DXT23, | ||
| 99 | PixelFormat::DXT23_SRGB, PixelFormat::DXT45, PixelFormat::DXT45_SRGB, | ||
| 100 | PixelFormat::DXN2SNORM, PixelFormat::BC7U, PixelFormat::BC7U_SRGB, | ||
| 101 | PixelFormat::BC6H_SF16, PixelFormat::BC6H_UF16, | ||
| 102 | }; | ||
| 103 | // Missing formats: | ||
| 104 | // PixelFormat::RGBA32I | ||
| 105 | // COMPRESSED_RG_RGTC2 | ||
| 106 | |||
| 107 | constexpr std::array COPY_CLASS_64_BITS = { | ||
| 108 | PixelFormat::RGBA16F, PixelFormat::RG32F, PixelFormat::RGBA16UI, PixelFormat::RG32UI, | ||
| 109 | PixelFormat::RGBA16U, PixelFormat::RGBA16S, PixelFormat::DXT1_SRGB, PixelFormat::DXT1, | ||
| 110 | |||
| 111 | }; | ||
| 112 | // Missing formats: | ||
| 113 | // PixelFormat::RGBA16I | ||
| 114 | // PixelFormat::RG32I, | ||
| 115 | // COMPRESSED_RGB_S3TC_DXT1_EXT | ||
| 116 | // COMPRESSED_SRGB_S3TC_DXT1_EXT | ||
| 117 | // COMPRESSED_RGBA_S3TC_DXT1_EXT | ||
| 118 | // COMPRESSED_SIGNED_RED_RGTC1 | ||
| 119 | |||
| 120 | void Enable(FormatCompatibility::Table& compatiblity, size_t format_a, size_t format_b) { | ||
| 121 | compatiblity[format_a][format_b] = true; | ||
| 122 | compatiblity[format_b][format_a] = true; | ||
| 123 | } | ||
| 124 | |||
| 125 | void Enable(FormatCompatibility::Table& compatibility, PixelFormat format_a, PixelFormat format_b) { | ||
| 126 | Enable(compatibility, static_cast<size_t>(format_a), static_cast<size_t>(format_b)); | ||
| 127 | } | ||
| 128 | |||
| 129 | template <typename Range> | ||
| 130 | void EnableRange(FormatCompatibility::Table& compatibility, const Range& range) { | ||
| 131 | for (auto it_a = range.begin(); it_a != range.end(); ++it_a) { | ||
| 132 | for (auto it_b = it_a; it_b != range.end(); ++it_b) { | ||
| 133 | Enable(*it_a, *it_b); | ||
| 134 | } | ||
| 135 | } | ||
| 136 | } | ||
| 137 | |||
| 138 | } // Anonymous namespace | ||
| 139 | |||
| 140 | FormatCompatibility::FormatCompatibility() { | ||
| 141 | for (size_t i = 0; i < MaxPixelFormat; ++i) { | ||
| 142 | // Identity is allowed | ||
| 143 | Enable(view, i, i); | ||
| 144 | } | ||
| 145 | |||
| 146 | EnableRange(view, VIEW_CLASS_128_BITS); | ||
| 147 | EnableRange(view, VIEW_CLASS_96_BITS); | ||
| 148 | EnableRange(view, VIEW_CLASS_64_BITS); | ||
| 149 | EnableRange(view, VIEW_CLASS_32_BITS); | ||
| 150 | EnableRange(view, VIEW_CLASS_16_BITS); | ||
| 151 | EnableRange(view, VIEW_CLASS_8_BITS); | ||
| 152 | EnableRange(view, VIEW_CLASS_RGTC1_RED); | ||
| 153 | EnableRange(view, VIEW_CLASS_RGTC2_RG); | ||
| 154 | EnableRange(view, VIEW_CLASS_BPTC_UNORM); | ||
| 155 | EnableRange(view, VIEW_CLASS_BPTC_FLOAT); | ||
| 156 | |||
| 157 | copy = view; | ||
| 158 | EnableRange(copy, COPY_CLASS_128_BITS); | ||
| 159 | EnableRange(copy, COPY_CLASS_64_BITS); | ||
| 160 | } | ||
| 161 | |||
| 162 | } // namespace VideoCore::Surface | ||
diff --git a/src/video_core/compatible_formats.h b/src/video_core/compatible_formats.h new file mode 100644 index 000000000..d1082566d --- /dev/null +++ b/src/video_core/compatible_formats.h | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | // Copyright 2020 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include <array> | ||
| 6 | #include <bitset> | ||
| 7 | #include <cstddef> | ||
| 8 | |||
| 9 | #include "video_core/surface.h" | ||
| 10 | |||
| 11 | namespace VideoCore::Surface { | ||
| 12 | |||
| 13 | class FormatCompatibility { | ||
| 14 | public: | ||
| 15 | using Table = std::array<std::bitset<MaxPixelFormat>, MaxPixelFormat>; | ||
| 16 | |||
| 17 | explicit FormatCompatibility(); | ||
| 18 | |||
| 19 | bool TestView(PixelFormat format_a, PixelFormat format_b) const noexcept { | ||
| 20 | return view[static_cast<size_t>(format_a)][static_cast<size_t>(format_b)]; | ||
| 21 | } | ||
| 22 | |||
| 23 | bool TestCopy(PixelFormat format_a, PixelFormat format_b) const noexcept { | ||
| 24 | return copy[static_cast<size_t>(format_a)][static_cast<size_t>(format_b)]; | ||
| 25 | } | ||
| 26 | |||
| 27 | private: | ||
| 28 | Table view; | ||
| 29 | Table copy; | ||
| 30 | }; | ||
| 31 | |||
| 32 | } // namespace VideoCore::Surface | ||