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

video_core: renderer_opengl: addressed comments... 

... removed incorrect comments and removed incorrect value calculations
This commit is contained in:
liushuyu 2019-03-13 19:17:29 -06:00
parent 164eb100eb
commit 476df9debf
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,15 +176,13 @@ static void MortonCopyTile(u32 stride, u8* tile_buffer, u8* gl_buffer) {
gl_ptr[0] = tile_ptr[3]; gl_ptr[0] = tile_ptr[3];
std::memcpy(gl_ptr + 1, tile_ptr, 3); std::memcpy(gl_ptr + 1, tile_ptr, 3);
} else if (format == PixelFormat::RGBA8 && GLES) { } else if (format == PixelFormat::RGBA8 && GLES) {
// because GLES does not have BGR format // because GLES does not have ABGR format
// so we will do byteswapping here // so we will do byteswapping here
gl_ptr[0] = tile_ptr[3]; gl_ptr[0] = tile_ptr[3];
gl_ptr[1] = tile_ptr[2]; gl_ptr[1] = tile_ptr[2];
gl_ptr[2] = tile_ptr[1]; gl_ptr[2] = tile_ptr[1];
gl_ptr[3] = tile_ptr[0]; gl_ptr[3] = tile_ptr[0];
} else if (format == PixelFormat::RGB8 && GLES) { } else if (format == PixelFormat::RGB8 && GLES) {
// the last channel Alpha should keep the same
// position as the original
gl_ptr[0] = tile_ptr[2]; gl_ptr[0] = tile_ptr[2];
gl_ptr[1] = tile_ptr[1]; gl_ptr[1] = tile_ptr[1];
gl_ptr[2] = tile_ptr[0]; gl_ptr[2] = tile_ptr[0];
@ -763,16 +761,16 @@ void CachedSurface::LoadGLBuffer(PAddr load_start, PAddr load_end) {
// cannot fully test this // cannot fully test this
if (pixel_format == PixelFormat::RGBA8) { if (pixel_format == PixelFormat::RGBA8) {
for (size_t i = start_offset; i < load_end - addr; i += 4) { for (size_t i = start_offset; i < load_end - addr; i += 4) {
gl_buffer[i] = *(texture_src_data + start_offset + i + 3); gl_buffer[i] = *(texture_src_data + i + 3);
gl_buffer[i + 1] = *(texture_src_data + start_offset + i + 2); gl_buffer[i + 1] = *(texture_src_data + i + 2);
gl_buffer[i + 2] = *(texture_src_data + start_offset + i + 1); gl_buffer[i + 2] = *(texture_src_data + i + 1);
gl_buffer[i + 3] = *(texture_src_data + start_offset + i); gl_buffer[i + 3] = *(texture_src_data + i);
} }
} else if (pixel_format == PixelFormat::RGB8) { } else if (pixel_format == PixelFormat::RGB8) {
for (size_t i = start_offset; i < load_end - addr; i += 3) { for (size_t i = start_offset; i < load_end - addr; i += 3) {
gl_buffer[i] = *(texture_src_data + start_offset + i + 2); gl_buffer[i] = *(texture_src_data + i + 2);
gl_buffer[i + 1] = *(texture_src_data + start_offset + i + 1); gl_buffer[i + 1] = *(texture_src_data + i + 1);
gl_buffer[i + 2] = *(texture_src_data + start_offset + i); gl_buffer[i + 2] = *(texture_src_data + i);
} }
} }
} else { } else {