diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-03-28 19:54:52 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-04-08 17:35:19 +0200 |
commit | a77e9a27b0e82192cd17eea255e6b04893ccafa7 (patch) | |
tree | 59046137210e4f1a521df694e38813527227c424 /src/video_core/renderer_opengl | |
parent | Refactor GetTextureCode and GetTexCode to use an optional instead of optional parameters (diff) | |
download | yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.tar yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.tar.gz yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.tar.bz2 yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.tar.lz yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.tar.xz yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.tar.zst yuzu-a77e9a27b0e82192cd17eea255e6b04893ccafa7.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index e847b75fb..30cad484a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -19,6 +19,7 @@ #include "core/core.h" #include "core/hle/kernel/process.h" #include "core/settings.h" +#include "video_core/const_buffer_accessor.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_shader_cache.h" @@ -101,7 +102,7 @@ struct FramebufferCacheKey { RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, ScreenInfo& info) : res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, system{system}, - screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE), const_buffer_accessor() { + screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) { // Create sampler objects for (std::size_t i = 0; i < texture_samplers.size(); ++i) { texture_samplers[i].Create(); @@ -990,7 +991,8 @@ void RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, const Shader& s } else { const auto cbuf = entry.GetBindlessCBuf(); Tegra::Texture::TextureHandle tex_handle; - tex_handle.raw = const_buffer_accessor.access32(stage, cbuf.first, cbuf.second); + tex_handle.raw = + Tegra::ConstBufferAccessor::access<u32>(stage, cbuf.first, cbuf.second); texture = maxwell3d.GetTextureInfo(tex_handle, entry.GetOffset()); } const u32 current_bindpoint = base_bindings.sampler + bindpoint; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 886e9c2b5..54fbf48aa 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -17,7 +17,6 @@ #include <glad/glad.h> #include "common/common_types.h" -#include "video_core/const_buffer_accessor.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/rasterizer_cache.h" #include "video_core/rasterizer_interface.h" @@ -230,8 +229,6 @@ private: PrimitiveAssembler primitive_assembler{buffer_cache}; GLint uniform_buffer_alignment; - Tegra::ConstBufferAccessor const_buffer_accessor; - std::size_t CalculateVertexArraysSize() const; std::size_t CalculateIndexBufferSize() const; |