diff options
author | bunnei <bunneidev@gmail.com> | 2019-07-15 01:03:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-15 01:03:43 +0200 |
commit | 3477b92289244a26e0bfd5a95d60bce53fd1ed61 (patch) | |
tree | 57f26db30db2d2f52029b1f51010459eb9dfb5e4 /src/video_core/renderer_opengl/utils.cpp | |
parent | Merge pull request #2690 from SciresM/physmem_fixes (diff) | |
parent | buffer_cache: Avoid [[nodiscard]] to make clang-format happy (diff) | |
download | yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.tar yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.tar.gz yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.tar.bz2 yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.tar.lz yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.tar.xz yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.tar.zst yuzu-3477b92289244a26e0bfd5a95d60bce53fd1ed61.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/utils.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/utils.cpp | 48 |
1 files changed, 43 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/utils.cpp b/src/video_core/renderer_opengl/utils.cpp index 68c36988d..c504a2c1a 100644 --- a/src/video_core/renderer_opengl/utils.cpp +++ b/src/video_core/renderer_opengl/utils.cpp @@ -13,29 +13,67 @@ namespace OpenGL { +VertexArrayPushBuffer::VertexArrayPushBuffer() = default; + +VertexArrayPushBuffer::~VertexArrayPushBuffer() = default; + +void VertexArrayPushBuffer::Setup(GLuint vao_) { + vao = vao_; + index_buffer = nullptr; + vertex_buffers.clear(); +} + +void VertexArrayPushBuffer::SetIndexBuffer(const GLuint* buffer) { + index_buffer = buffer; +} + +void VertexArrayPushBuffer::SetVertexBuffer(GLuint binding_index, const GLuint* buffer, + GLintptr offset, GLsizei stride) { + vertex_buffers.push_back(Entry{binding_index, buffer, offset, stride}); +} + +void VertexArrayPushBuffer::Bind() { + if (index_buffer) { + glVertexArrayElementBuffer(vao, *index_buffer); + } + + // TODO(Rodrigo): Find a way to ARB_multi_bind this + for (const auto& entry : vertex_buffers) { + glVertexArrayVertexBuffer(vao, entry.binding_index, *entry.buffer, entry.offset, + entry.stride); + } +} + BindBuffersRangePushBuffer::BindBuffersRangePushBuffer(GLenum target) : target{target} {} BindBuffersRangePushBuffer::~BindBuffersRangePushBuffer() = default; void BindBuffersRangePushBuffer::Setup(GLuint first_) { first = first_; - buffers.clear(); + buffer_pointers.clear(); offsets.clear(); sizes.clear(); } -void BindBuffersRangePushBuffer::Push(GLuint buffer, GLintptr offset, GLsizeiptr size) { - buffers.push_back(buffer); +void BindBuffersRangePushBuffer::Push(const GLuint* buffer, GLintptr offset, GLsizeiptr size) { + buffer_pointers.push_back(buffer); offsets.push_back(offset); sizes.push_back(size); } -void BindBuffersRangePushBuffer::Bind() const { - const std::size_t count{buffers.size()}; +void BindBuffersRangePushBuffer::Bind() { + // Ensure sizes are valid. + const std::size_t count{buffer_pointers.size()}; DEBUG_ASSERT(count == offsets.size() && count == sizes.size()); if (count == 0) { return; } + + // Dereference buffers. + buffers.resize(count); + std::transform(buffer_pointers.begin(), buffer_pointers.end(), buffers.begin(), + [](const GLuint* pointer) { return *pointer; }); + glBindBuffersRange(target, first, static_cast<GLsizei>(count), buffers.data(), offsets.data(), sizes.data()); } |