ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4505 from hthh/macos-likes-pbos 

OpenGL: Always use a PBO in EncodeToRamUsingShader
This commit is contained in:
Markus Wick 2016-12-19 09:47:40 +01:00 committed by GitHub
parent f431b18675 801d1d1876
commit 989cdc0929
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Core/VideoBackends/OGL/TextureConverter.cpp
View File

@ -242,34 +242,31 @@ static void EncodeToRamUsingShader(GLuint srcTexture, u8* destAddr, u32 dst_line
int dstSize = dst_line_size * dstHeight; int dstSize = dst_line_size * dstHeight;
if ((writeStride != dst_line_size) && (dstHeight > 1)) // When the dst_line_size and writeStride are the same, we could use glReadPixels directly to RAM.
{ // But instead we always copy the data via a PBO, because macOS inexplicably prefers this (most
// writing to a texture of a different size // noticeably in the Super Mario Sunshine transition).
// also copy more then one block line, so the different strides matters glBindBuffer(GL_PIXEL_PACK_BUFFER, s_PBO);
// copy into one pbo first, map this buffer, and then memcpy into GC memory glBufferData(GL_PIXEL_PACK_BUFFER, dstSize, nullptr, GL_STREAM_READ);
// in this way, we only have one vram->ram transfer, but maybe a bigger glReadPixels(0, 0, (GLsizei)(dst_line_size / 4), (GLsizei)dstHeight, GL_BGRA, GL_UNSIGNED_BYTE,
// CPU overhead because of the pbo nullptr);
glBindBuffer(GL_PIXEL_PACK_BUFFER, s_PBO); u8* pbo = (u8*)glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, dstSize, GL_MAP_READ_BIT);
glBufferData(GL_PIXEL_PACK_BUFFER, dstSize, nullptr, GL_STREAM_READ);
glReadPixels(0, 0, (GLsizei)(dst_line_size / 4), (GLsizei)dstHeight, GL_BGRA, GL_UNSIGNED_BYTE,
nullptr);
u8* pbo = (u8*)glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, dstSize, GL_MAP_READ_BIT);
if (dst_line_size == writeStride)
{
memcpy(destAddr, pbo, dst_line_size * dstHeight);
}
else
{
for (size_t i = 0; i < dstHeight; ++i) for (size_t i = 0; i < dstHeight; ++i)
{ {
memcpy(destAddr, pbo, dst_line_size); memcpy(destAddr, pbo, dst_line_size);
pbo += dst_line_size; pbo += dst_line_size;
destAddr += writeStride; destAddr += writeStride;
} }
}
glUnmapBuffer(GL_PIXEL_PACK_BUFFER); glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
}
else
{
glReadPixels(0, 0, (GLsizei)(dst_line_size / 4), (GLsizei)dstHeight, GL_BGRA, GL_UNSIGNED_BYTE,
destAddr);
}
} }
void EncodeToRamFromTexture(u8* dest_ptr, u32 format, u32 native_width, u32 bytes_per_row, void EncodeToRamFromTexture(u8* dest_ptr, u32 format, u32 native_width, u32 bytes_per_row,