mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-01-25 18:10:48 +01:00
gl: Commit to using DSA for internal buffer management
- Gets rid of spammy BindBuffer calls on every draw
This commit is contained in:
kd-11
kd-11
parent
ed2068fb03
commit
78746fdb6f
|
|
@ -196,7 +196,7 @@ namespace gl
|
|||
ARB_texture_buffer_supported = true;
|
||||
|
||||
// Check for expected library entry-points for some required functions
|
||||
if (!ARB_buffer_storage_supported && glBufferStorage && glMapBufferRange)
|
||||
if (!ARB_buffer_storage_supported && glNamedBufferStorage && glMapNamedBufferRange)
|
||||
ARB_buffer_storage_supported = true;
|
||||
|
||||
if (!ARB_dsa_supported && glGetTextureImage && glTextureBufferRange)
|
||||
|
|
|
|||
|
|
@ -58,6 +58,12 @@ namespace gl
|
|||
gl##func##EXT(object_name, target, __VA_ARGS__);
|
||||
|
||||
#define DSA_CALL2(func, object_name, ...)\
|
||||
if (::gl::get_driver_caps().ARB_dsa_supported)\
|
||||
gl##func(object_name, __VA_ARGS__);\
|
||||
else\
|
||||
gl##func##EXT(object_name, __VA_ARGS__);
|
||||
|
||||
#define DSA_CALL2_RET(func, object_name, ...)\
|
||||
(::gl::get_driver_caps().ARB_dsa_supported) ?\
|
||||
gl##func(object_name, __VA_ARGS__) :\
|
||||
gl##func##EXT(object_name, __VA_ARGS__)
|
||||
|
|
@ -584,10 +590,7 @@ namespace gl
|
|||
if (const auto& caps = get_driver_caps();
|
||||
caps.ARB_buffer_storage_supported)
|
||||
{
|
||||
target target_ = current_target();
|
||||
save_binding_state save(target_, *this);
|
||||
GLenum flags = 0;
|
||||
|
||||
if (type == memory_type::host_visible)
|
||||
{
|
||||
switch (usage)
|
||||
|
|
@ -617,7 +620,8 @@ namespace gl
|
|||
flags |= GL_CLIENT_STORAGE_BIT;
|
||||
}
|
||||
|
||||
glBufferStorage(static_cast<GLenum>(target_), size, data_, flags);
|
||||
save_binding_state save(current_target(), *this);
|
||||
DSA_CALL2(NamedBufferStorage, m_id, size, data_, flags);
|
||||
m_size = size;
|
||||
}
|
||||
else
|
||||
|
|
@ -744,15 +748,17 @@ namespace gl
|
|||
{
|
||||
ensure(m_memory_type == memory_type::host_visible);
|
||||
|
||||
const GLenum access_bits = static_cast<GLenum>(access_);
|
||||
auto raw_data = DSA_CALL2(MapNamedBufferRange, id(), offset, length, access_bits | GL_MAP_UNSYNCHRONIZED_BIT);
|
||||
GLenum access_bits = static_cast<GLenum>(access_);
|
||||
if (access_bits == GL_MAP_WRITE_BIT) access_bits |= GL_MAP_UNSYNCHRONIZED_BIT;
|
||||
|
||||
auto raw_data = DSA_CALL2_RET(MapNamedBufferRange, id(), offset, length, access_bits);
|
||||
return reinterpret_cast<GLubyte*>(raw_data);
|
||||
}
|
||||
|
||||
void unmap()
|
||||
{
|
||||
ensure(m_memory_type == memory_type::host_visible);
|
||||
glUnmapBuffer(static_cast<GLenum>(current_target()));
|
||||
DSA_CALL2(UnmapNamedBuffer, id());
|
||||
}
|
||||
|
||||
void bind_range(u32 index, u32 offset, u32 size) const
|
||||
|
|
@ -798,17 +804,18 @@ namespace gl
|
|||
}
|
||||
|
||||
buffer::create();
|
||||
save_binding_state save(current_target(), *this);
|
||||
|
||||
GLbitfield buffer_storage_flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT;
|
||||
if (gl::get_driver_caps().vendor_MESA) buffer_storage_flags |= GL_CLIENT_STORAGE_BIT;
|
||||
|
||||
glBindBuffer(static_cast<GLenum>(m_target), m_id);
|
||||
glBufferStorage(static_cast<GLenum>(m_target), size, data, buffer_storage_flags);
|
||||
m_memory_mapping = glMapBufferRange(static_cast<GLenum>(m_target), 0, size, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
|
||||
DSA_CALL2(NamedBufferStorage, m_id, size, data, buffer_storage_flags);
|
||||
m_memory_mapping = DSA_CALL2_RET(MapNamedBufferRange, m_id, 0, size, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
|
||||
|
||||
ensure(m_memory_mapping != nullptr);
|
||||
m_data_loc = 0;
|
||||
m_size = ::narrow<u32>(size);
|
||||
m_memory_type = memory_type::host_visible;
|
||||
}
|
||||
|
||||
void create(target target_, GLsizeiptr size, const void* data_ = nullptr)
|
||||
|
|
@ -847,8 +854,7 @@ namespace gl
|
|||
{
|
||||
if (m_memory_mapping)
|
||||
{
|
||||
glBindBuffer(static_cast<GLenum>(m_target), m_id);
|
||||
glUnmapBuffer(static_cast<GLenum>(m_target));
|
||||
buffer::unmap();
|
||||
|
||||
m_memory_mapping = nullptr;
|
||||
m_data_loc = 0;
|
||||
|
|
@ -919,8 +925,7 @@ namespace gl
|
|||
m_data_loc = 0;
|
||||
}
|
||||
|
||||
glBindBuffer(static_cast<GLenum>(m_target), m_id);
|
||||
m_memory_mapping = glMapBufferRange(static_cast<GLenum>(m_target), m_data_loc, block_size, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
|
||||
m_memory_mapping = DSA_CALL2_RET(MapNamedBufferRange, m_id, m_data_loc, block_size, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
|
||||
m_mapped_bytes = block_size;
|
||||
m_mapping_offset = m_data_loc;
|
||||
m_alignment_offset = 0;
|
||||
|
|
@ -979,7 +984,6 @@ namespace gl
|
|||
|
||||
void unmap() override
|
||||
{
|
||||
buffer::bind();
|
||||
buffer::unmap();
|
||||
|
||||
m_memory_mapping = nullptr;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ OPENGL_PROC(PFNGLISBUFFERPROC, IsBuffer);
|
|||
OPENGL_PROC(PFNGLBUFFERDATAPROC, BufferData);
|
||||
OPENGL_PROC(PFNGLBUFFERSUBDATAPROC, BufferSubData);
|
||||
OPENGL_PROC(PFNGLGETBUFFERSUBDATAPROC, GetBufferSubData);
|
||||
OPENGL_PROC(PFNGLMAPBUFFERPROC, MapBuffer);
|
||||
OPENGL_PROC(PFNGLUNMAPBUFFERPROC, UnmapBuffer);
|
||||
OPENGL_PROC(PFNGLGETBUFFERPARAMETERIVPROC, GetBufferParameteriv);
|
||||
OPENGL_PROC(PFNGLGETBUFFERPOINTERVPROC, GetBufferPointerv);
|
||||
OPENGL_PROC(PFNGLBLENDFUNCSEPARATEPROC, BlendFuncSeparate);
|
||||
|
|
@ -170,12 +168,13 @@ OPENGL_PROC(PFNGLGETINTEGERI_VPROC, GetIntegeri_v);
|
|||
|
||||
OPENGL_PROC(PFNGLCHECKFRAMEBUFFERSTATUSPROC, CheckFramebufferStatus);
|
||||
|
||||
OPENGL_PROC(PFNGLMAPBUFFERRANGEPROC, MapBufferRange);
|
||||
OPENGL_PROC(PFNGLBINDBUFFERRANGEPROC, BindBufferRange);
|
||||
OPENGL_PROC(PFNGLBINDBUFFERBASEPROC, BindBufferBase);
|
||||
|
||||
OPENGL_PROC(PFNGLMAPNAMEDBUFFERRANGEPROC, MapNamedBufferRange);
|
||||
OPENGL_PROC(PFNGLMAPNAMEDBUFFERRANGEEXTPROC, MapNamedBufferRangeEXT);
|
||||
OPENGL_PROC(PFNGLUNMAPNAMEDBUFFERPROC, UnmapNamedBuffer);
|
||||
OPENGL_PROC(PFNGLUNMAPNAMEDBUFFEREXTPROC, UnmapNamedBufferEXT);
|
||||
|
||||
OPENGL_PROC(PFNGLMULTIDRAWELEMENTSPROC, MultiDrawElements);
|
||||
OPENGL_PROC(PFNGLMULTIDRAWARRAYSPROC, MultiDrawArrays);
|
||||
|
|
@ -218,7 +217,8 @@ OPENGL_PROC(PFNGLTEXTUREBUFFERRANGEPROC, TextureBufferRange);
|
|||
OPENGL_PROC(PFNGLCOPYIMAGESUBDATAPROC, CopyImageSubData);
|
||||
|
||||
// ARB_Buffer_Storage
|
||||
OPENGL_PROC(PFNGLBUFFERSTORAGEPROC, BufferStorage);
|
||||
OPENGL_PROC(PFNGLNAMEDBUFFERSTORAGEPROC, NamedBufferStorage);
|
||||
OPENGL_PROC(PFNGLNAMEDBUFFERSTORAGEEXTPROC, NamedBufferStorageEXT);
|
||||
|
||||
// ARB_sync
|
||||
OPENGL_PROC(PFNGLFENCESYNCPROC, FenceSync);
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ namespace gl
|
|||
void cached_texture_section::finish_flush()
|
||||
{
|
||||
// Free resources
|
||||
glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
|
||||
glBindBuffer(GL_PIXEL_PACK_BUFFER, GL_NONE);
|
||||
pbo.unmap();
|
||||
|
||||
const auto valid_range = get_confirmed_range_delta();
|
||||
const u32 valid_offset = valid_range.first;
|
||||
|
|
|
|||
|
|
@ -328,9 +328,7 @@ namespace gl
|
|||
m_fence.wait_for_signal();
|
||||
|
||||
ensure(offset + GLsizeiptr{size} <= pbo.size());
|
||||
pbo.bind(buffer::target::pixel_pack);
|
||||
|
||||
return glMapBufferRange(GL_PIXEL_PACK_BUFFER, offset, size, GL_MAP_READ_BIT);
|
||||
return pbo.map(offset, size, gl::buffer::access::read);
|
||||
}
|
||||
|
||||
void finish_flush();
|
||||
|
|
|
|||
Loading…
Reference in a new issue