diff options
author | Subv <subv2112@gmail.com> | 2018-05-19 18:36:09 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-05-19 18:36:09 +0200 |
commit | 370ab5df9b34882fb17d5fe680b4c48f6d56065c (patch) | |
tree | 40094e30fdee5975374caf19d81ac2dd6a90670f /src/video_core | |
parent | Merge pull request #436 from bunnei/multi-core (diff) | |
download | yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.tar yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.tar.gz yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.tar.bz2 yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.tar.lz yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.tar.xz yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.tar.zst yuzu-370ab5df9b34882fb17d5fe680b4c48f6d56065c.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 5 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 907236136..39546b7ef 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -75,14 +75,11 @@ RasterizerOpenGL::RasterizerOpenGL() { // Clipping plane 0 is always enabled for PICA fixed clip plane z <= 0 state.clip_distance[0] = true; - // Generate VBO, VAO and UBO - vertex_buffer = OGLStreamBuffer::MakeBuffer(GLAD_GL_ARB_buffer_storage, GL_ARRAY_BUFFER); - vertex_buffer->Create(VERTEX_BUFFER_SIZE, VERTEX_BUFFER_SIZE / 2); + // Generate VAO and UBO sw_vao.Create(); uniform_buffer.Create(); state.draw.vertex_array = sw_vao.handle; - state.draw.vertex_buffer = vertex_buffer->GetHandle(); state.draw.uniform_buffer = uniform_buffer.handle; state.Apply(); diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 9709e595e..158b74436 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -141,14 +141,11 @@ private: Tegra::Engines::Maxwell3D::Regs::MaxShaderStage> ssbos; - static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024; - std::unique_ptr<OGLStreamBuffer> vertex_buffer; + static constexpr size_t STREAM_BUFFER_SIZE = 128 * 1024 * 1024; + std::unique_ptr<OGLStreamBuffer> stream_buffer; OGLBuffer uniform_buffer; OGLFramebuffer framebuffer; - static constexpr size_t STREAM_BUFFER_SIZE = 4 * 1024 * 1024; - std::unique_ptr<OGLStreamBuffer> stream_buffer; - size_t CalculateVertexArraysSize() const; std::pair<u8*, GLintptr> SetupVertexArrays(u8* array_ptr, GLintptr buffer_offset); |