octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

morton_swizzle: Implement texture formats in UNSWIZZLE_TABLE

Browse Source 
* I can now remove that loop that has been messing with my OCD
This commit is contained in:
emufan4568
2022-09-10 23:30:32 +03:00
committed by GPUCode
parent fa870be263
commit 3619bd33b1
7 changed files with 187 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/video_core/rasterizer_cache/utils.cpp
View File

@ -5,11 +5,13 @@
#pragma once
#include <glad/glad.h>
#include "common/assert.h"
#include "core/memory.h"
#include "video_core/texture/texture_decode.h"
#include "video_core/rasterizer_cache/morton_swizzle.h"
#include "video_core/rasterizer_cache/surface_params.h"
#include "video_core/rasterizer_cache/utils.h"
#include "video_core/renderer_opengl/gl_vars.h"
#include "video_core/video_core.h"
namespace OpenGL {
@ -57,45 +59,18 @@ const FormatTuple& GetFormatTuple(PixelFormat pixel_format) {
return tex_tuple;
}
void SwizzleTexture(const SurfaceParams& params, u32 flush_start, u32 flush_end,
void SwizzleTexture(const SurfaceParams& params, u32 start_offset,
std::span<std::byte> source_linear, std::span<std::byte> dest_tiled) {
const u32 func_index = static_cast<u32>(params.pixel_format);
const MortonFunc SwizzleImpl = SWIZZLE_TABLE[func_index];
// TODO: Move memory access out of the morton function
SwizzleImpl(params.stride, params.height, source_linear, dest_tiled, params.addr, flush_start, flush_end);
SwizzleImpl(params.stride, params.height, start_offset, source_linear, dest_tiled);
}
void UnswizzleTexture(const SurfaceParams& params, u32 load_start, u32 load_end,
void UnswizzleTexture(const SurfaceParams& params, u32 start_offset,
std::span<std::byte> source_tiled, std::span<std::byte> dest_linear) {
// TODO: Integrate this to UNSWIZZLE_TABLE
if (params.type == SurfaceType::Texture) {
Pica::Texture::TextureInfo tex_info{};
tex_info.width = params.width;
tex_info.height = params.height;
tex_info.format = static_cast<Pica::TexturingRegs::TextureFormat>(params.pixel_format);
tex_info.SetDefaultStride();
tex_info.physical_address = params.addr;
const SurfaceInterval load_interval(load_start, load_end);
const auto rect = params.GetSubRect(params.FromInterval(load_interval));
DEBUG_ASSERT(params.FromInterval(load_interval).GetInterval() == load_interval);
const u8* source_data = reinterpret_cast<const u8*>(source_tiled.data());
for (u32 y = rect.bottom; y < rect.top; y++) {
for (u32 x = rect.left; x < rect.right; x++) {
auto vec4 =
Pica::Texture::LookupTexture(source_data, x, params.height - 1 - y, tex_info);
const std::size_t offset = (x + (params.width * y)) * 4;
std::memcpy(dest_linear.data() + offset, vec4.AsArray(), 4);
}
}
} else {
const u32 func_index = static_cast<u32>(params.pixel_format);
const MortonFunc UnswizzleImpl = UNSWIZZLE_TABLE[func_index];
UnswizzleImpl(params.stride, params.height, dest_linear, source_tiled, params.addr, load_start, load_end);
}
const u32 func_index = static_cast<u32>(params.pixel_format);
const MortonFunc UnswizzleImpl = UNSWIZZLE_TABLE[func_index];
UnswizzleImpl(params.stride, params.height, start_offset, dest_linear, source_tiled);
}
ClearValue MakeClearValue(SurfaceType type, PixelFormat format, const u8* fill_data) {