sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenGLDevice: Fix PBO and non-PBO path for SW renderer

Browse Source
This commit is contained in:
Stenzek
2023-09-20 19:35:43 +10:00
parent 3c47f9b1b1
commit 0e0beec1f4
3 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/opengl_device.cpp
View File

@ -395,7 +395,7 @@ bool OpenGLDevice::CheckFeatures(bool* buggy_pbo)
const bool is_shitty_mobile_driver = (vendor_id_powervr || vendor_id_qualcomm || vendor_id_arm);
const bool is_buggy_pbo =
(!GLAD_GL_VERSION_4_4 && !GLAD_GL_ARB_buffer_storage && !GLAD_GL_EXT_buffer_storage) || is_shitty_mobile_driver;
*buggy_pbo = true;// is_buggy_pbo;
*buggy_pbo = is_buggy_pbo;
if (is_buggy_pbo && !is_shitty_mobile_driver)
Log_WarningPrint("Not using PBOs for texture uploads because buffer_storage is unavailable.");

8
src/util/opengl_texture.cpp
View File

@ -205,7 +205,7 @@ bool OpenGLTexture::Update(u32 x, u32 y, u32 width, u32 height, const void* data
{
GL_INS("Not using PBO for map size %u", map_size);
glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / GetPixelSize());
glTextureSubImage2D(target, layer, x, y, width, height, gl_format, gl_type, data);
glTexSubImage2D(target, layer, x, y, width, height, gl_format, gl_type, data);
}
else
{
@ -215,8 +215,8 @@ bool OpenGLTexture::Update(u32 x, u32 y, u32 width, u32 height, const void* data
sb->Bind();
glPixelStorei(GL_UNPACK_ROW_LENGTH, preferred_pitch / GetPixelSize());
glTextureSubImage2D(GL_TEXTURE_2D, layer, x, y, width, height, gl_format, gl_type,
reinterpret_cast<void*>(static_cast<uintptr_t>(map.buffer_offset)));
glTexSubImage2D(GL_TEXTURE_2D, layer, x, y, width, height, gl_format, gl_type,
reinterpret_cast<void*>(static_cast<uintptr_t>(map.buffer_offset)));
sb->Unbind();
}
@ -261,7 +261,7 @@ void OpenGLTexture::Unmap()
sb->Unmap(upload_size);
sb->Bind();
glPixelStorei(GL_UNPACK_ROW_LENGTH, m_map_width);
glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / GetPixelSize());
OpenGLDevice::BindUpdateTextureUnit();