summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/engines/maxwell_3d.cpp3
-rw-r--r--src/video_core/gpu.h3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.h3
-rw-r--r--src/video_core/textures/texture.h4
4 files changed, 11 insertions, 2 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 41f0e5c9b..a2f162602 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -221,7 +221,8 @@ Texture::TICEntry Maxwell3D::GetTICEntry(u32 tic_index) const {
221 ASSERT_MSG(tic_entry.header_version == Texture::TICHeaderVersion::BlockLinear, 221 ASSERT_MSG(tic_entry.header_version == Texture::TICHeaderVersion::BlockLinear,
222 "TIC versions other than BlockLinear are unimplemented"); 222 "TIC versions other than BlockLinear are unimplemented");
223 223
224 ASSERT_MSG(tic_entry.texture_type == Texture::TextureType::Texture2D, 224 ASSERT_MSG((tic_entry.texture_type == Texture::TextureType::Texture2D) ||
225 (tic_entry.texture_type == Texture::TextureType::Texture2DNoMipmap),
225 "Texture types other than Texture2D are unimplemented"); 226 "Texture types other than Texture2D are unimplemented");
226 227
227 auto r_type = tic_entry.r_type.Value(); 228 auto r_type = tic_entry.r_type.Value();
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index 71a8661b4..2888daedc 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -15,7 +15,10 @@ namespace Tegra {
15 15
16enum class RenderTargetFormat : u32 { 16enum class RenderTargetFormat : u32 {
17 NONE = 0x0, 17 NONE = 0x0,
18 RGBA16_FLOAT = 0xCA,
19 RGB10_A2_UNORM = 0xD1,
18 RGBA8_UNORM = 0xD5, 20 RGBA8_UNORM = 0xD5,
21 RGBA8_SRGB = 0xD6,
19}; 22};
20 23
21class DebugContext; 24class DebugContext;
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index e7ce506cf..3293905d6 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -87,6 +87,7 @@ struct SurfaceParams {
87 case Tegra::RenderTargetFormat::RGBA8_UNORM: 87 case Tegra::RenderTargetFormat::RGBA8_UNORM:
88 return PixelFormat::RGBA8; 88 return PixelFormat::RGBA8;
89 default: 89 default:
90 NGLOG_CRITICAL(HW_GPU, "Unimplemented format={}", static_cast<u32>(format));
90 UNREACHABLE(); 91 UNREACHABLE();
91 } 92 }
92 } 93 }
@@ -96,6 +97,7 @@ struct SurfaceParams {
96 case Tegra::FramebufferConfig::PixelFormat::ABGR8: 97 case Tegra::FramebufferConfig::PixelFormat::ABGR8:
97 return PixelFormat::RGBA8; 98 return PixelFormat::RGBA8;
98 default: 99 default:
100 NGLOG_CRITICAL(HW_GPU, "Unimplemented format={}", static_cast<u32>(format));
99 UNREACHABLE(); 101 UNREACHABLE();
100 } 102 }
101 } 103 }
@@ -108,6 +110,7 @@ struct SurfaceParams {
108 case Tegra::Texture::TextureFormat::DXT1: 110 case Tegra::Texture::TextureFormat::DXT1:
109 return PixelFormat::DXT1; 111 return PixelFormat::DXT1;
110 default: 112 default:
113 NGLOG_CRITICAL(HW_GPU, "Unimplemented format={}", static_cast<u32>(format));
111 UNREACHABLE(); 114 UNREACHABLE();
112 } 115 }
113 } 116 }
diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h
index c12ed6e1d..9d443ea90 100644
--- a/src/video_core/textures/texture.h
+++ b/src/video_core/textures/texture.h
@@ -13,8 +13,10 @@ namespace Tegra {
13namespace Texture { 13namespace Texture {
14 14
15enum class TextureFormat : u32 { 15enum class TextureFormat : u32 {
16 A8R8G8B8 = 8, 16 A8R8G8B8 = 0x8,
17 DXT1 = 0x24, 17 DXT1 = 0x24,
18 DXT23 = 0x25,
19 DXT45 = 0x26,
18}; 20};
19 21
20enum class TextureType : u32 { 22enum class TextureType : u32 {