hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2403 from FernandoS27/compressed-linear 

Support compressed formats on linear textures.
This commit is contained in:
bunnei 2019-04-22 17:09:42 -04:00 committed by GitHub
parent 68b707711a 773d955dfa
commit b5889cbd6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
View File

@ -640,13 +640,16 @@ void CachedSurface::LoadGLBuffer() {
SwizzleFunc(MortonSwizzleMode::MortonToLinear, params, gl_buffer[i], i); SwizzleFunc(MortonSwizzleMode::MortonToLinear, params, gl_buffer[i], i);
} else { } else {
const u32 bpp = params.GetFormatBpp() / 8; const u32 bpp = params.GetFormatBpp() / 8;
const u32 copy_size = params.width * bpp; const u32 copy_size = (params.width * bpp + GetDefaultBlockWidth(params.pixel_format) - 1) /
GetDefaultBlockWidth(params.pixel_format);
if (params.pitch == copy_size) { if (params.pitch == copy_size) {
std::memcpy(gl_buffer[0].data(), params.host_ptr, params.size_in_bytes_gl); std::memcpy(gl_buffer[0].data(), params.host_ptr, params.size_in_bytes_gl);
} else { } else {
const u32 height = (params.height + GetDefaultBlockHeight(params.pixel_format) - 1) /
GetDefaultBlockHeight(params.pixel_format);
const u8* start{params.host_ptr}; const u8* start{params.host_ptr};
u8* write_to = gl_buffer[0].data(); u8* write_to = gl_buffer[0].data();
for (u32 h = params.height; h > 0; h--) { for (u32 h = height; h > 0; h--) {
std::memcpy(write_to, start, copy_size); std::memcpy(write_to, start, copy_size);
start += params.pitch; start += params.pitch;
write_to += copy_size; write_to += copy_size;