From afa7f4996f2f50f52f3a5c7ee81076901bc10d54 Mon Sep 17 00:00:00 2001 From: zhang wei Date: Mon, 24 Jan 2022 16:44:12 +0800 Subject: [PATCH] fx bgr write back on gles (#5924) --- .../renderer_opengl/gl_rasterizer_cache.cpp | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 25e345098..bece76a17 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -117,6 +117,17 @@ static void MortonCopyTile(u32 stride, u8* tile_buffer, u8* gl_buffer) { if constexpr (format == PixelFormat::D24S8) { std::memcpy(tile_ptr, gl_ptr + 1, 3); tile_ptr[3] = gl_ptr[0]; + } else if (format == PixelFormat::RGBA8 && GLES) { + // because GLES does not have ABGR format + // so we will do byteswapping here + tile_ptr[0] = gl_ptr[3]; + tile_ptr[1] = gl_ptr[2]; + tile_ptr[2] = gl_ptr[1]; + tile_ptr[3] = gl_ptr[0]; + } else if (format == PixelFormat::RGB8 && GLES) { + tile_ptr[0] = gl_ptr[2]; + tile_ptr[1] = gl_ptr[1]; + tile_ptr[2] = gl_ptr[0]; } else { std::memcpy(tile_ptr, gl_ptr, bytes_per_pixel); } @@ -638,7 +649,23 @@ void CachedSurface::FlushGLBuffer(PAddr flush_start, PAddr flush_end) { std::memcpy(&dst_buffer[coarse_start_offset], &backup_data[0], backup_bytes); } else if (!is_tiled) { ASSERT(type == SurfaceType::Color); - std::memcpy(dst_buffer + start_offset, &gl_buffer[start_offset], flush_end - flush_start); + if (pixel_format == PixelFormat::RGBA8 && GLES) { + for (std::size_t i = start_offset; i < flush_end - addr; i += 4) { + dst_buffer[i] = gl_buffer[i + 3]; + dst_buffer[i + 1] = gl_buffer[i + 2]; + dst_buffer[i + 2] = gl_buffer[i + 1]; + dst_buffer[i + 3] = gl_buffer[i]; + } + } else if (pixel_format == PixelFormat::RGB8 && GLES) { + for (std::size_t i = start_offset; i < flush_end - addr; i += 3) { + dst_buffer[i] = gl_buffer[i + 2]; + dst_buffer[i + 1] = gl_buffer[i + 1]; + dst_buffer[i + 2] = gl_buffer[i]; + } + } else { + std::memcpy(dst_buffer + start_offset, &gl_buffer[start_offset], + flush_end - flush_start); + } } else { gl_to_morton_fns[static_cast(pixel_format)](stride, height, &gl_buffer[0], addr, flush_start, flush_end);