RasterizerCache: Remove 3DS-specific pixel formats.

We're only left with RGB8 and DXT1 for now. More will be added as they are needed.
This commit is contained in:
Subv 2018-03-26 21:46:11 -05:00 committed by James Rowe
parent c28ed85875
commit b305646c44
2 changed files with 32 additions and 71 deletions

View File

@ -92,22 +92,12 @@ static void MortonCopyTile(u32 stride, u8* tile_buffer, u8* gl_buffer) {
u8* tile_ptr = tile_buffer + VideoCore::MortonInterleave(x, y) * bytes_per_pixel; u8* tile_ptr = tile_buffer + VideoCore::MortonInterleave(x, y) * bytes_per_pixel;
u8* gl_ptr = gl_buffer + ((7 - y) * stride + x) * gl_bytes_per_pixel; u8* gl_ptr = gl_buffer + ((7 - y) * stride + x) * gl_bytes_per_pixel;
if (morton_to_gl) { if (morton_to_gl) {
if (format == PixelFormat::D24S8) {
gl_ptr[0] = tile_ptr[3];
std::memcpy(gl_ptr + 1, tile_ptr, 3);
} else {
std::memcpy(gl_ptr, tile_ptr, bytes_per_pixel); std::memcpy(gl_ptr, tile_ptr, bytes_per_pixel);
}
} else {
if (format == PixelFormat::D24S8) {
std::memcpy(tile_ptr, gl_ptr + 1, 3);
tile_ptr[3] = gl_ptr[0];
} else { } else {
std::memcpy(tile_ptr, gl_ptr, bytes_per_pixel); std::memcpy(tile_ptr, gl_ptr, bytes_per_pixel);
} }
} }
} }
}
} }
template <bool morton_to_gl, PixelFormat format> template <bool morton_to_gl, PixelFormat format>

View File

@ -24,6 +24,7 @@
#include "common/math_util.h" #include "common/math_util.h"
#include "video_core/gpu.h" #include "video_core/gpu.h"
#include "video_core/renderer_opengl/gl_resource_manager.h" #include "video_core/renderer_opengl/gl_resource_manager.h"
#include "video_core/textures/texture.h"
struct CachedSurface; struct CachedSurface;
using Surface = std::shared_ptr<CachedSurface>; using Surface = std::shared_ptr<CachedSurface>;
@ -51,30 +52,8 @@ enum class ScaleMatch {
struct SurfaceParams { struct SurfaceParams {
enum class PixelFormat { enum class PixelFormat {
// First 5 formats are shared between textures and color buffers
RGBA8 = 0, RGBA8 = 0,
RGB8 = 1, DXT1 = 1,
RGB5A1 = 2,
RGB565 = 3,
RGBA4 = 4,
// Texture-only formats
IA8 = 5,
RG8 = 6,
I8 = 7,
A8 = 8,
IA4 = 9,
I4 = 10,
A4 = 11,
ETC1 = 12,
ETC1A4 = 13,
// Depth buffer-only formats
D16 = 14,
// gap
D24 = 16,
D24S8 = 17,
Invalid = 255, Invalid = 255,
}; };
@ -88,28 +67,15 @@ struct SurfaceParams {
}; };
static constexpr unsigned int GetFormatBpp(PixelFormat format) { static constexpr unsigned int GetFormatBpp(PixelFormat format) {
constexpr std::array<unsigned int, 18> bpp_table = { if (format == PixelFormat::Invalid)
return 0;
constexpr std::array<unsigned int, 2> bpp_table = {
32, // RGBA8 32, // RGBA8
24, // RGB8 64, // DXT1
16, // RGB5A1
16, // RGB565
16, // RGBA4
16, // IA8
16, // RG8
8, // I8
8, // A8
8, // IA4
4, // I4
4, // A4
4, // ETC1
8, // ETC1A4
16, // D16
0,
24, // D24
32, // D24S8
}; };
assert(static_cast<size_t>(format) < bpp_table.size()); ASSERT(static_cast<size_t>(format) < bpp_table.size());
return bpp_table[static_cast<size_t>(format)]; return bpp_table[static_cast<size_t>(format)];
} }
unsigned int GetFormatBpp() const { unsigned int GetFormatBpp() const {
@ -134,6 +100,18 @@ struct SurfaceParams {
} }
} }
static PixelFormat PixelFormatFromTextureFormat(Tegra::Texture::TextureFormat format) {
// TODO(Subv): Properly implement this
switch (format) {
case Tegra::Texture::TextureFormat::A8R8G8B8:
return PixelFormat::RGBA8;
case Tegra::Texture::TextureFormat::DXT1:
return PixelFormat::DXT1;
default:
UNREACHABLE();
}
}
static bool CheckFormatsBlittable(PixelFormat pixel_format_a, PixelFormat pixel_format_b) { static bool CheckFormatsBlittable(PixelFormat pixel_format_a, PixelFormat pixel_format_b) {
SurfaceType a_type = GetFormatType(pixel_format_a); SurfaceType a_type = GetFormatType(pixel_format_a);
SurfaceType b_type = GetFormatType(pixel_format_b); SurfaceType b_type = GetFormatType(pixel_format_b);
@ -154,22 +132,17 @@ struct SurfaceParams {
return false; return false;
} }
static constexpr SurfaceType GetFormatType(PixelFormat pixel_format) { static SurfaceType GetFormatType(PixelFormat pixel_format) {
if ((unsigned int)pixel_format < 5) { if ((unsigned int)pixel_format <= static_cast<unsigned int>(PixelFormat::RGBA8)) {
return SurfaceType::Color; return SurfaceType::Color;
} }
if ((unsigned int)pixel_format < 14) { if ((unsigned int)pixel_format <= static_cast<unsigned int>(PixelFormat::DXT1)) {
return SurfaceType::Texture; return SurfaceType::Texture;
} }
if (pixel_format == PixelFormat::D16 || pixel_format == PixelFormat::D24) { // TODO(Subv): Implement the other formats
return SurfaceType::Depth; ASSERT(false);
}
if (pixel_format == PixelFormat::D24S8) {
return SurfaceType::DepthStencil;
}
return SurfaceType::Invalid; return SurfaceType::Invalid;
} }
@ -265,12 +238,10 @@ struct CachedSurface : SurfaceParams {
OGLTexture texture; OGLTexture texture;
static constexpr unsigned int GetGLBytesPerPixel(PixelFormat format) { static constexpr unsigned int GetGLBytesPerPixel(PixelFormat format) {
// OpenGL needs 4 bpp alignment for D24 since using GL_UNSIGNED_INT as type if (format == PixelFormat::Invalid)
return format == PixelFormat::Invalid return 0;
? 0
: (format == PixelFormat::D24 || GetFormatType(format) == SurfaceType::Texture) return SurfaceParams::GetFormatBpp(format) / 8;
? 4
: SurfaceParams::GetFormatBpp(format) / 8;
} }
std::unique_ptr<u8[]> gl_buffer; std::unique_ptr<u8[]> gl_buffer;
@ -313,7 +284,7 @@ public:
bool load_if_create); bool load_if_create);
/// Get a surface based on the texture configuration /// Get a surface based on the texture configuration
Surface GetTextureSurface(const void* config); Surface GetTextureSurface(const Tegra::Texture::FullTextureInfo& config);
/// Get the color and depth surfaces based on the framebuffer configuration /// Get the color and depth surfaces based on the framebuffer configuration
SurfaceSurfaceRect_Tuple GetFramebufferSurfaces(bool using_color_fb, bool using_depth_fb, SurfaceSurfaceRect_Tuple GetFramebufferSurfaces(bool using_color_fb, bool using_depth_fb,