39c97f1b65
Making the stream buffer resident increases GPU usage significantly on some games. This seems to be addressed invalidating the stream buffer with InvalidateBufferData instead of using a Unmap + Map (with invalidation flags).
80 lines
2.6 KiB
C++
80 lines
2.6 KiB
C++
// Copyright 2018 Citra Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <tuple>
|
|
#include <vector>
|
|
|
|
#include "common/alignment.h"
|
|
#include "common/assert.h"
|
|
#include "common/microprofile.h"
|
|
#include "video_core/renderer_opengl/gl_device.h"
|
|
#include "video_core/renderer_opengl/gl_stream_buffer.h"
|
|
|
|
MICROPROFILE_DEFINE(OpenGL_StreamBuffer, "OpenGL", "Stream Buffer Orphaning",
|
|
MP_RGB(128, 128, 192));
|
|
|
|
namespace OpenGL {
|
|
|
|
OGLStreamBuffer::OGLStreamBuffer(const Device& device, GLsizeiptr size, bool vertex_data_usage)
|
|
: buffer_size(size) {
|
|
gl_buffer.Create();
|
|
|
|
GLsizeiptr allocate_size = size;
|
|
if (vertex_data_usage) {
|
|
// On AMD GPU there is a strange crash in indexed drawing. The crash happens when the buffer
|
|
// read position is near the end and is an out-of-bound access to the vertex buffer. This is
|
|
// probably a bug in the driver and is related to the usage of vec3<byte> attributes in the
|
|
// vertex array. Doubling the allocation size for the vertex buffer seems to avoid the
|
|
// crash.
|
|
allocate_size *= 2;
|
|
}
|
|
|
|
static constexpr GLbitfield flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT;
|
|
glNamedBufferStorage(gl_buffer.handle, allocate_size, nullptr, flags);
|
|
mapped_ptr = static_cast<u8*>(
|
|
glMapNamedBufferRange(gl_buffer.handle, 0, buffer_size, flags | GL_MAP_FLUSH_EXPLICIT_BIT));
|
|
|
|
if (device.HasVertexBufferUnifiedMemory()) {
|
|
glMakeNamedBufferResidentNV(gl_buffer.handle, GL_READ_ONLY);
|
|
glGetNamedBufferParameterui64vNV(gl_buffer.handle, GL_BUFFER_GPU_ADDRESS_NV, &gpu_address);
|
|
}
|
|
}
|
|
|
|
OGLStreamBuffer::~OGLStreamBuffer() {
|
|
glUnmapNamedBuffer(gl_buffer.handle);
|
|
gl_buffer.Release();
|
|
}
|
|
|
|
std::tuple<u8*, GLintptr, bool> OGLStreamBuffer::Map(GLsizeiptr size, GLintptr alignment) {
|
|
ASSERT(size <= buffer_size);
|
|
ASSERT(alignment <= buffer_size);
|
|
mapped_size = size;
|
|
|
|
if (alignment > 0) {
|
|
buffer_pos = Common::AlignUp<std::size_t>(buffer_pos, alignment);
|
|
}
|
|
|
|
bool invalidate = false;
|
|
if (buffer_pos + size > buffer_size) {
|
|
MICROPROFILE_SCOPE(OpenGL_StreamBuffer);
|
|
glInvalidateBufferData(gl_buffer.handle);
|
|
|
|
buffer_pos = 0;
|
|
invalidate = true;
|
|
}
|
|
|
|
return std::make_tuple(mapped_ptr + buffer_pos, buffer_pos, invalidate);
|
|
}
|
|
|
|
void OGLStreamBuffer::Unmap(GLsizeiptr size) {
|
|
ASSERT(size <= mapped_size);
|
|
|
|
if (size > 0) {
|
|
glFlushMappedNamedBufferRange(gl_buffer.handle, buffer_pos, size);
|
|
}
|
|
|
|
buffer_pos += size;
|
|
}
|
|
|
|
} // namespace OpenGL
|