diff options
author | Markus Wick <markus@selfnet.de> | 2018-08-10 10:29:37 +0200 |
---|---|---|
committer | Markus Wick <markus@selfnet.de> | 2018-08-12 16:10:26 +0200 |
commit | 6ff7906ddc89d8f970702d320f29317831de7975 (patch) | |
tree | 97c15d6b51b71a1a2904dc1c148ff7b9c66e0477 /src/video_core/renderer_opengl/gl_rasterizer.h | |
parent | gl_rasterizer: Use the streaming buffer itself for the constant buffer. (diff) | |
download | yuzu-6ff7906ddc89d8f970702d320f29317831de7975.tar yuzu-6ff7906ddc89d8f970702d320f29317831de7975.tar.gz yuzu-6ff7906ddc89d8f970702d320f29317831de7975.tar.bz2 yuzu-6ff7906ddc89d8f970702d320f29317831de7975.tar.lz yuzu-6ff7906ddc89d8f970702d320f29317831de7975.tar.xz yuzu-6ff7906ddc89d8f970702d320f29317831de7975.tar.zst yuzu-6ff7906ddc89d8f970702d320f29317831de7975.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 6f8503703..aa6afc1de 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -7,6 +7,7 @@ #include <array> #include <cstddef> #include <memory> +#include <tuple> #include <utility> #include <vector> #include <glad/glad.h> @@ -100,9 +101,10 @@ private: * @param entries Vector describing the buffers that are actually used in the guest shader. * @returns The next available bindpoint for use in the next shader stage. */ - u32 SetupConstBuffers(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, GLuint program, - u32 current_bindpoint, - const std::vector<GLShader::ConstBufferEntry>& entries); + std::tuple<u8*, GLintptr, u32> SetupConstBuffers( + u8* buffer_ptr, GLintptr buffer_offset, Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, + GLuint program, u32 current_bindpoint, + const std::vector<GLShader::ConstBufferEntry>& entries); /* * Configures the current textures to use for the draw command. @@ -154,9 +156,6 @@ private: OGLVertexArray hw_vao; std::array<SamplerInfo, GLShader::NumTextureSamplers> texture_samplers; - std::array<std::array<OGLBuffer, Tegra::Engines::Maxwell3D::Regs::MaxConstBuffers>, - Tegra::Engines::Maxwell3D::Regs::MaxShaderStage> - ssbos; static constexpr size_t STREAM_BUFFER_SIZE = 128 * 1024 * 1024; OGLStreamBuffer stream_buffer; |