diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-11 06:32:12 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-09-06 01:35:51 +0200 |
commit | 04cdecb7a114471fec50deab86bcd160ec85feb4 (patch) | |
tree | 69af6a51405451420ac7b80cf6d5b43f50b4e73f /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | gl_rasterizer: Implement image bindings (diff) | |
download | yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.tar yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.tar.gz yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.tar.bz2 yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.tar.lz yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.tar.xz yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.tar.zst yuzu-04cdecb7a114471fec50deab86bcd160ec85feb4.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 9 |
1 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 6636b3c74..818e71754 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -991,7 +991,7 @@ TextureBufferUsage RasterizerOpenGL::SetupDrawTextures(Maxwell::ShaderStage stag const auto& maxwell3d = gpu.Maxwell3D(); const auto& entries = shader->GetShaderEntries().samplers; - ASSERT_MSG(base_bindings.sampler + entries.size() <= std::size(state.texture_units), + ASSERT_MSG(base_bindings.sampler + entries.size() <= std::size(state.textures), "Exceeded the number of active textures."); TextureBufferUsage texture_buffer_usage{0}; @@ -1019,16 +1019,15 @@ TextureBufferUsage RasterizerOpenGL::SetupDrawTextures(Maxwell::ShaderStage stag bool RasterizerOpenGL::SetupTexture(const Shader& shader, u32 binding, const Tegra::Texture::FullTextureInfo& texture, const GLShader::SamplerEntry& entry) { - auto& unit{state.texture_units[binding]}; - unit.sampler = sampler_cache.GetSampler(texture.tsc); + state.samplers[binding] = sampler_cache.GetSampler(texture.tsc); const auto view = texture_cache.GetTextureSurface(texture.tic, entry); if (!view) { // Can occur when texture addr is null or its memory is unmapped/invalid - unit.texture = 0; + state.textures[binding] = 0; return false; } - unit.texture = view->GetTexture(); + state.textures[binding] = view->GetTexture(); if (view->GetSurfaceParams().IsBuffer()) { return true; |