million/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Eliminated unnessessary memory allocation and copy (#1702)

Browse source
This commit is contained in:
Frederic L 2018-11-19 04:53:03 +01:00 committed by bunnei
parent 3e93c30630
commit 11a1442229
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
View file

@ -381,11 +381,8 @@ void MortonCopy(u32 stride, u32 block_height, u32 height, u32 block_depth, u32 d
const u32 tile_size_y{GetDefaultBlockHeight(format)}; const u32 tile_size_y{GetDefaultBlockHeight(format)};
if (morton_to_gl) { if (morton_to_gl) {
const std::vector<u8> data = Tegra::Texture::UnswizzleTexture(gl_buffer, addr, tile_size_x, tile_size_y, bytes_per_pixel,
Tegra::Texture::UnswizzleTexture(addr, tile_size_x, tile_size_y, bytes_per_pixel,
stride, height, depth, block_height, block_depth); stride, height, depth, block_height, block_depth);
const std::size_t size_to_copy{std::min(gl_buffer_size, data.size())};
memcpy(gl_buffer, data.data(), size_to_copy);
} else { } else {
Tegra::Texture::CopySwizzledData((stride + tile_size_x - 1) / tile_size_x, Tegra::Texture::CopySwizzledData((stride + tile_size_x - 1) / tile_size_x,
(height + tile_size_y - 1) / tile_size_y, depth, (height + tile_size_y - 1) / tile_size_y, depth,

15
src/video_core/textures/decoders.cpp
View file

@ -229,14 +229,21 @@ u32 BytesPerPixel(TextureFormat format) {
} }
} }
void UnswizzleTexture(u8* const unswizzled_data, VAddr address, u32 tile_size_x, u32 tile_size_y,
u32 bytes_per_pixel, u32 width, u32 height, u32 depth, u32 block_height,
u32 block_depth) {
CopySwizzledData((width + tile_size_x - 1) / tile_size_x,
(height + tile_size_y - 1) / tile_size_y, depth, bytes_per_pixel,
bytes_per_pixel, Memory::GetPointer(address), unswizzled_data, true,
block_height, block_depth);
}
std::vector<u8> UnswizzleTexture(VAddr address, u32 tile_size_x, u32 tile_size_y, std::vector<u8> UnswizzleTexture(VAddr address, u32 tile_size_x, u32 tile_size_y,
u32 bytes_per_pixel, u32 width, u32 height, u32 depth, u32 bytes_per_pixel, u32 width, u32 height, u32 depth,
u32 block_height, u32 block_depth) { u32 block_height, u32 block_depth) {
std::vector<u8> unswizzled_data(width * height * depth * bytes_per_pixel); std::vector<u8> unswizzled_data(width * height * depth * bytes_per_pixel);
CopySwizzledData((width + tile_size_x - 1) / tile_size_x, UnswizzleTexture(unswizzled_data.data(), address, tile_size_x, tile_size_y, bytes_per_pixel,
(height + tile_size_y - 1) / tile_size_y, depth, bytes_per_pixel, width, height, depth, block_height, block_depth);
bytes_per_pixel, Memory::GetPointer(address), unswizzled_data.data(), true,
block_height, block_depth);
return unswizzled_data; return unswizzled_data;
} }

7
src/video_core/textures/decoders.h
View file

@ -16,6 +16,13 @@ inline std::size_t GetGOBSize() {
return 512; return 512;
} }
/**
* Unswizzles a swizzled texture without changing its format.
*/
void UnswizzleTexture(u8* unswizzled_data, VAddr address, u32 tile_size_x, u32 tile_size_y,
u32 bytes_per_pixel, u32 width, u32 height, u32 depth,
u32 block_height = TICEntry::DefaultBlockHeight,
u32 block_depth = TICEntry::DefaultBlockHeight);
/** /**
* Unswizzles a swizzled texture without changing its format. * Unswizzles a swizzled texture without changing its format.
*/ */