diff options
author | Subv <subv2112@gmail.com> | 2018-05-27 16:02:05 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-05-27 16:02:05 +0200 |
commit | 7ddc872b529192fd822c1d759ccfac2398b6ca2a (patch) | |
tree | 5f839f0f1337359b2a3bb66c2e9d0d8b3d268ff0 /src/video_core/renderer_opengl | |
parent | Add & correct miscellaneous things (#470) (diff) | |
download | yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.gz yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.bz2 yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.lz yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.xz yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.zst yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 7 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.h | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 501d15e98..e652bd9ed 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -47,6 +47,7 @@ static constexpr std::array<FormatTuple, SurfaceParams::MaxPixelFormat> tex_form {GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, false}, // ABGR8 {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV, false}, // B5G6R5 {GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false}, // A2B10G10R10 + {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, false}, // A1B5G5R5 {GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_RGB, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT1 {GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT23 {GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT45 @@ -107,8 +108,9 @@ static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra: SurfaceParams::MaxPixelFormat> morton_to_gl_fns = { MortonCopy<true, PixelFormat::ABGR8>, MortonCopy<true, PixelFormat::B5G6R5>, - MortonCopy<true, PixelFormat::A2B10G10R10>, MortonCopy<true, PixelFormat::DXT1>, - MortonCopy<true, PixelFormat::DXT23>, MortonCopy<true, PixelFormat::DXT45>, + MortonCopy<true, PixelFormat::A2B10G10R10>, MortonCopy<true, PixelFormat::A1B5G5R5>, + MortonCopy<true, PixelFormat::DXT1>, MortonCopy<true, PixelFormat::DXT23>, + MortonCopy<true, PixelFormat::DXT45>, }; static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra::GPUVAddr, @@ -118,6 +120,7 @@ static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra: MortonCopy<false, PixelFormat::ABGR8>, MortonCopy<false, PixelFormat::B5G6R5>, MortonCopy<false, PixelFormat::A2B10G10R10>, + MortonCopy<false, PixelFormat::A1B5G5R5>, // TODO(Subv): Swizzling the DXT1/DXT23/DXT45 formats is not yet supported nullptr, nullptr, diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index 55f1bdee8..03e28f64a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h @@ -57,9 +57,10 @@ struct SurfaceParams { ABGR8 = 0, B5G6R5 = 1, A2B10G10R10 = 2, - DXT1 = 3, - DXT23 = 4, - DXT45 = 5, + A1B5G5R5 = 3, + DXT1 = 4, + DXT23 = 5, + DXT45 = 6, Max, Invalid = 255, @@ -98,6 +99,7 @@ struct SurfaceParams { 1, // ABGR8 1, // B5G6R5 1, // A2B10G10R10 + 1, // A1B5G5R5 4, // DXT1 4, // DXT23 4, // DXT45 @@ -118,6 +120,7 @@ struct SurfaceParams { 32, // ABGR8 16, // B5G6R5 32, // A2B10G10R10 + 16, // A1B5G5R5 64, // DXT1 128, // DXT23 128, // DXT45 @@ -133,6 +136,7 @@ struct SurfaceParams { static PixelFormat PixelFormatFromRenderTargetFormat(Tegra::RenderTargetFormat format) { switch (format) { case Tegra::RenderTargetFormat::RGBA8_UNORM: + case Tegra::RenderTargetFormat::RGBA8_SRGB: return PixelFormat::ABGR8; case Tegra::RenderTargetFormat::RGB10_A2_UNORM: return PixelFormat::A2B10G10R10; @@ -161,6 +165,8 @@ struct SurfaceParams { return PixelFormat::B5G6R5; case Tegra::Texture::TextureFormat::A2B10G10R10: return PixelFormat::A2B10G10R10; + case Tegra::Texture::TextureFormat::A1B5G5R5: + return PixelFormat::A1B5G5R5; case Tegra::Texture::TextureFormat::DXT1: return PixelFormat::DXT1; case Tegra::Texture::TextureFormat::DXT23: @@ -182,6 +188,8 @@ struct SurfaceParams { return Tegra::Texture::TextureFormat::B5G6R5; case PixelFormat::A2B10G10R10: return Tegra::Texture::TextureFormat::A2B10G10R10; + case PixelFormat::A1B5G5R5: + return Tegra::Texture::TextureFormat::A1B5G5R5; case PixelFormat::DXT1: return Tegra::Texture::TextureFormat::DXT1; case PixelFormat::DXT23: @@ -208,6 +216,7 @@ struct SurfaceParams { // TODO(Subv): Implement more render targets switch (format) { case Tegra::RenderTargetFormat::RGBA8_UNORM: + case Tegra::RenderTargetFormat::RGBA8_SRGB: case Tegra::RenderTargetFormat::RGB10_A2_UNORM: return ComponentType::UNorm; default: |