diff options
| author | FernandoS27 <fsahmkow27@gmail.com> | 2018-10-29 23:23:32 +0100 |
|---|---|---|
| committer | FernandoS27 <fsahmkow27@gmail.com> | 2018-11-01 18:06:24 +0100 |
| commit | 31930a3334df4fc352621d3c0bd31d03c81bc99e (patch) | |
| tree | 2c6ab7a42a28eb4091dc15eb496bc62062a95ae7 | |
| parent | Merge pull request #1527 from FernandoS27/assert-flow (diff) | |
| download | yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.tar yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.tar.gz yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.tar.bz2 yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.tar.lz yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.tar.xz yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.tar.zst yuzu-31930a3334df4fc352621d3c0bd31d03c81bc99e.zip | |
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index f194a7687..43c47cb10 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -305,6 +305,8 @@ static constexpr std::array<FormatTuple, VideoCore::Surface::MaxPixelFormat> tex {GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false}, // ASTC_2D_8X8_SRGB {GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false}, // ASTC_2D_8X5_SRGB {GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false}, // ASTC_2D_5X4_SRGB + {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false}, // ASTC_2D_5X5 + {GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE, ComponentType::UNorm, false}, // ASTC_2D_5X5_SRGB // Depth formats {GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, ComponentType::Float, false}, // Z32F @@ -903,10 +905,12 @@ static void ConvertFormatAsNeeded_LoadGLBuffer(std::vector<u8>& data, PixelForma case PixelFormat::ASTC_2D_8X8: case PixelFormat::ASTC_2D_8X5: case PixelFormat::ASTC_2D_5X4: + case PixelFormat::ASTC_2D_5X5: case PixelFormat::ASTC_2D_4X4_SRGB: case PixelFormat::ASTC_2D_8X8_SRGB: case PixelFormat::ASTC_2D_8X5_SRGB: - case PixelFormat::ASTC_2D_5X4_SRGB: { + case PixelFormat::ASTC_2D_5X4_SRGB: + case PixelFormat::ASTC_2D_5X5_SRGB: { // Convert ASTC pixel formats to RGBA8, as most desktop GPUs do not support ASTC. u32 block_width{}; u32 block_height{}; |