Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGLHostDisplay: Don't use PBOs for software upload on GLES

Browse source
This commit is contained in:
Connor McLaughlin 2021-02-06 15:02:28 +10:00
parent 701edb335a
commit c6ed19cc7b
2 changed files with 49 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/frontend-common/opengl_host_display.cpp
View file

@ -196,21 +196,33 @@ bool OpenGLHostDisplay::BeginSetDisplayPixels(HostDisplayPixelFormat format, u32
const u32 pixel_size = GetDisplayPixelFormatSize(format); const u32 pixel_size = GetDisplayPixelFormatSize(format);
const u32 stride = Common::AlignUpPow2(width * pixel_size, 4); const u32 stride = Common::AlignUpPow2(width * pixel_size, 4);
const u32 size_required = stride * height * pixel_size; const u32 size_required = stride * height * pixel_size;
const u32 buffer_size = Common::AlignUpPow2(size_required * 2, 4 * 1024 * 1024);
if (!m_display_pixels_texture_pbo || m_display_pixels_texture_pbo->GetSize() < buffer_size)
{
m_display_pixels_texture_pbo.reset();
m_display_pixels_texture_pbo = GL::StreamBuffer::Create(GL_PIXEL_UNPACK_BUFFER, buffer_size);
if (!m_display_pixels_texture_pbo)
return false;
}
const auto map = m_display_pixels_texture_pbo->Map(GetDisplayPixelFormatSize(format), size_required); if (!m_gl_context->IsGLES())
m_display_texture_format = format; {
m_display_pixels_texture_pbo_map_offset = map.buffer_offset; const u32 buffer_size = Common::AlignUpPow2(size_required * 2, 4 * 1024 * 1024);
m_display_pixels_texture_pbo_map_size = size_required; if (!m_display_pixels_texture_pbo || m_display_pixels_texture_pbo->GetSize() < buffer_size)
*out_buffer = map.pointer; {
*out_pitch = stride; m_display_pixels_texture_pbo.reset();
m_display_pixels_texture_pbo = GL::StreamBuffer::Create(GL_PIXEL_UNPACK_BUFFER, buffer_size);
if (!m_display_pixels_texture_pbo)
return false;
}
const auto map = m_display_pixels_texture_pbo->Map(GetDisplayPixelFormatSize(format), size_required);
m_display_texture_format = format;
m_display_pixels_texture_pbo_map_offset = map.buffer_offset;
m_display_pixels_texture_pbo_map_size = size_required;
*out_buffer = map.pointer;
*out_pitch = stride;
}
else
{
if (m_gles_pixels_repack_buffer.size() < size_required)
m_gles_pixels_repack_buffer.resize(size_required);
*out_buffer = m_gles_pixels_repack_buffer.data();
*out_pitch = stride;
}
BindDisplayPixelsTexture(); BindDisplayPixelsTexture();
SetDisplayTexture(reinterpret_cast<void*>(static_cast<uintptr_t>(m_display_pixels_texture_id)), format, width, height, SetDisplayTexture(reinterpret_cast<void*>(static_cast<uintptr_t>(m_display_pixels_texture_id)), format, width, height,
@ -226,17 +238,26 @@ void OpenGLHostDisplay::EndSetDisplayPixels()
const auto [gl_internal_format, gl_format, gl_type] = const auto [gl_internal_format, gl_format, gl_type] =
s_display_pixel_format_mapping[static_cast<u32>(m_display_texture_format)]; s_display_pixel_format_mapping[static_cast<u32>(m_display_texture_format)];
// glTexImage2D should be quicker on Mali...
m_display_pixels_texture_pbo->Unmap(m_display_pixels_texture_pbo_map_size);
m_display_pixels_texture_pbo->Bind();
glBindTexture(GL_TEXTURE_2D, m_display_pixels_texture_id); glBindTexture(GL_TEXTURE_2D, m_display_pixels_texture_id);
glTexImage2D(GL_TEXTURE_2D, 0, gl_internal_format, width, height, 0, gl_format, gl_type, if (!m_gl_context->IsGLES())
reinterpret_cast<void*>(static_cast<uintptr_t>(m_display_pixels_texture_pbo_map_offset))); {
glBindTexture(GL_TEXTURE_2D, 0); m_display_pixels_texture_pbo->Unmap(m_display_pixels_texture_pbo_map_size);
m_display_pixels_texture_pbo->Unbind(); m_display_pixels_texture_pbo->Bind();
glTexImage2D(GL_TEXTURE_2D, 0, gl_internal_format, width, height, 0, gl_format, gl_type,
reinterpret_cast<void*>(static_cast<uintptr_t>(m_display_pixels_texture_pbo_map_offset)));
m_display_pixels_texture_pbo->Unbind();
m_display_pixels_texture_pbo_map_offset = 0; m_display_pixels_texture_pbo_map_offset = 0;
m_display_pixels_texture_pbo_map_size = 0; m_display_pixels_texture_pbo_map_size = 0;
}
else
{
// glTexImage2D should be quicker on Mali...
glTexImage2D(GL_TEXTURE_2D, 0, gl_internal_format, width, height, 0, gl_format, gl_type,
m_gles_pixels_repack_buffer.data());
}
glBindTexture(GL_TEXTURE_2D, 0);
} }
bool OpenGLHostDisplay::SetDisplayPixels(HostDisplayPixelFormat format, u32 width, u32 height, const void* buffer, bool OpenGLHostDisplay::SetDisplayPixels(HostDisplayPixelFormat format, u32 width, u32 height, const void* buffer,
@ -264,11 +285,11 @@ bool OpenGLHostDisplay::SetDisplayPixels(HostDisplayPixelFormat format, u32 widt
// Otherwise, we need to repack the image. // Otherwise, we need to repack the image.
const u32 packed_pitch = width * pixel_size; const u32 packed_pitch = width * pixel_size;
const u32 repack_size = packed_pitch * height; const u32 repack_size = packed_pitch * height;
if (m_gles2_pixels_repack_buffer.size() < repack_size) if (m_gles_pixels_repack_buffer.size() < repack_size)
m_gles2_pixels_repack_buffer.resize(repack_size); m_gles_pixels_repack_buffer.resize(repack_size);
StringUtil::StrideMemCpy(m_gles2_pixels_repack_buffer.data(), packed_pitch, buffer, pitch, packed_pitch, height); StringUtil::StrideMemCpy(m_gles_pixels_repack_buffer.data(), packed_pitch, buffer, pitch, packed_pitch, height);
glTexImage2D(GL_TEXTURE_2D, 0, gl_internal_format, width, height, 0, gl_format, gl_type, glTexImage2D(GL_TEXTURE_2D, 0, gl_internal_format, width, height, 0, gl_format, gl_type,
m_gles2_pixels_repack_buffer.data()); m_gles_pixels_repack_buffer.data());
} }
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);

2
src/frontend-common/opengl_host_display.h
View file

@ -113,6 +113,7 @@ protected:
std::unique_ptr<GL::StreamBuffer> m_display_pixels_texture_pbo; std::unique_ptr<GL::StreamBuffer> m_display_pixels_texture_pbo;
u32 m_display_pixels_texture_pbo_map_offset = 0; u32 m_display_pixels_texture_pbo_map_offset = 0;
u32 m_display_pixels_texture_pbo_map_size = 0; u32 m_display_pixels_texture_pbo_map_size = 0;
std::vector<u8> m_gles_pixels_repack_buffer;
PostProcessingChain m_post_processing_chain; PostProcessingChain m_post_processing_chain;
GL::Texture m_post_processing_input_texture; GL::Texture m_post_processing_input_texture;
@ -121,7 +122,6 @@ protected:
bool m_display_texture_is_linear_filtered = false; bool m_display_texture_is_linear_filtered = false;
bool m_use_gles2_draw_path = false; bool m_use_gles2_draw_path = false;
std::vector<u8> m_gles2_pixels_repack_buffer;
}; };
} // namespace FrontendCommon } // namespace FrontendCommon