citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

rasterizer_cache: Move depth tuples to cpp file

This commit is contained in:
emufan4568 2022-08-20 12:27:47 +03:00
parent 22acfe4d41
commit 0fedf11be1
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/video_core/rasterizer_cache/rasterizer_cache.cpp
View File

@ -38,6 +38,15 @@
namespace OpenGL { namespace OpenGL {
constexpr FormatTuple tex_tuple = {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE};
static constexpr std::array<FormatTuple, 4> depth_format_tuples = {{
{GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT}, // D16
{},
{GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT}, // D24
{GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8}, // D24S8
}};
static constexpr std::array<FormatTuple, 5> fb_format_tuples = {{ static constexpr std::array<FormatTuple, 5> fb_format_tuples = {{
{GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8}, // RGBA8 {GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8}, // RGBA8
{GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE}, // RGB8 {GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE}, // RGB8
@ -59,17 +68,17 @@ static constexpr std::array<FormatTuple, 5> fb_format_tuples_oes = {{
const FormatTuple& GetFormatTuple(PixelFormat pixel_format) { const FormatTuple& GetFormatTuple(PixelFormat pixel_format) {
const SurfaceType type = GetFormatType(pixel_format); const SurfaceType type = GetFormatType(pixel_format);
const std::size_t format_index = static_cast<std::size_t>(pixel_format);
if (type == SurfaceType::Color) { if (type == SurfaceType::Color) {
ASSERT(static_cast<std::size_t>(pixel_format) < fb_format_tuples.size()); ASSERT(format_index < fb_format_tuples.size());
if (GLES) { return (GLES ? fb_format_tuples_oes : fb_format_tuples)[format_index];
return fb_format_tuples_oes[static_cast<unsigned int>(pixel_format)];
}
return fb_format_tuples[static_cast<unsigned int>(pixel_format)];
} else if (type == SurfaceType::Depth || type == SurfaceType::DepthStencil) { } else if (type == SurfaceType::Depth || type == SurfaceType::DepthStencil) {
std::size_t tuple_idx = static_cast<std::size_t>(pixel_format) - 14; const std::size_t tuple_idx = format_index - 14;
ASSERT(tuple_idx < depth_format_tuples.size()); ASSERT(tuple_idx < depth_format_tuples.size());
return depth_format_tuples[tuple_idx]; return depth_format_tuples[tuple_idx];
} }
return tex_tuple; return tex_tuple;
} }

10
src/video_core/rasterizer_cache/rasterizer_cache.h
View File

@ -43,14 +43,13 @@ struct FormatTuple {
GLenum type; GLenum type;
}; };
constexpr FormatTuple tex_tuple = {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE};
const FormatTuple& GetFormatTuple(PixelFormat pixel_format); const FormatTuple& GetFormatTuple(PixelFormat pixel_format);
struct HostTextureTag { struct HostTextureTag {
FormatTuple format_tuple; FormatTuple format_tuple;
u32 width; u32 width;
u32 height; u32 height;
bool operator==(const HostTextureTag& rhs) const noexcept { bool operator==(const HostTextureTag& rhs) const noexcept {
return std::tie(format_tuple.format, format_tuple.internal_format, width, height) == return std::tie(format_tuple.format, format_tuple.internal_format, width, height) ==
std::tie(rhs.format_tuple.format, rhs.format_tuple.internal_format, rhs.width, std::tie(rhs.format_tuple.format, rhs.format_tuple.internal_format, rhs.width,
@ -260,13 +259,6 @@ struct CachedTextureCube {
std::shared_ptr<SurfaceWatcher> nz; std::shared_ptr<SurfaceWatcher> nz;
}; };
static constexpr std::array<FormatTuple, 4> depth_format_tuples = {{
{GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT}, // D16
{},
{GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT}, // D24
{GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8}, // D24S8
}};
class TextureDownloaderES; class TextureDownloaderES;
class RasterizerCacheOpenGL : NonCopyable { class RasterizerCacheOpenGL : NonCopyable {