diff options
author | bunnei <bunneidev@gmail.com> | 2020-01-16 17:21:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-16 17:21:18 +0100 |
commit | d23869811d49c87c468b81db908d7b1555cbca56 (patch) | |
tree | 8ddd8be56d739544f4a585027ee265cac314d3f2 /src/video_core | |
parent | Merge pull request #3307 from jroweboy/fix-git (diff) | |
parent | renderer_opengl/utils: Remove unused header inclusions (diff) | |
download | yuzu-d23869811d49c87c468b81db908d7b1555cbca56.tar yuzu-d23869811d49c87c468b81db908d7b1555cbca56.tar.gz yuzu-d23869811d49c87c468b81db908d7b1555cbca56.tar.bz2 yuzu-d23869811d49c87c468b81db908d7b1555cbca56.tar.lz yuzu-d23869811d49c87c468b81db908d7b1555cbca56.tar.xz yuzu-d23869811d49c87c468b81db908d7b1555cbca56.tar.zst yuzu-d23869811d49c87c468b81db908d7b1555cbca56.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/renderer_opengl/utils.cpp | 17 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/utils.h | 14 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/video_core/renderer_opengl/utils.cpp b/src/video_core/renderer_opengl/utils.cpp index 9770dda1c..ac99e6385 100644 --- a/src/video_core/renderer_opengl/utils.cpp +++ b/src/video_core/renderer_opengl/utils.cpp @@ -6,16 +6,20 @@ #include <vector> #include <fmt/format.h> - #include <glad/glad.h> -#include "common/assert.h" #include "common/common_types.h" -#include "common/scope_exit.h" #include "video_core/renderer_opengl/utils.h" namespace OpenGL { +struct VertexArrayPushBuffer::Entry { + GLuint binding_index{}; + const GLuint* buffer{}; + GLintptr offset{}; + GLsizei stride{}; +}; + VertexArrayPushBuffer::VertexArrayPushBuffer() = default; VertexArrayPushBuffer::~VertexArrayPushBuffer() = default; @@ -47,6 +51,13 @@ void VertexArrayPushBuffer::Bind() { } } +struct BindBuffersRangePushBuffer::Entry { + GLuint binding; + const GLuint* buffer; + GLintptr offset; + GLsizeiptr size; +}; + BindBuffersRangePushBuffer::BindBuffersRangePushBuffer(GLenum target) : target{target} {} BindBuffersRangePushBuffer::~BindBuffersRangePushBuffer() = default; diff --git a/src/video_core/renderer_opengl/utils.h b/src/video_core/renderer_opengl/utils.h index d56153fe7..3ad7c02d4 100644 --- a/src/video_core/renderer_opengl/utils.h +++ b/src/video_core/renderer_opengl/utils.h @@ -26,12 +26,7 @@ public: void Bind(); private: - struct Entry { - GLuint binding_index{}; - const GLuint* buffer{}; - GLintptr offset{}; - GLsizei stride{}; - }; + struct Entry; GLuint vao{}; const GLuint* index_buffer{}; @@ -50,12 +45,7 @@ public: void Bind(); private: - struct Entry { - GLuint binding; - const GLuint* buffer; - GLintptr offset; - GLsizeiptr size; - }; + struct Entry; GLenum target; std::vector<Entry> entries; |