diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-10-30 00:46:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-30 00:46:33 +0100 |
commit | 2ec5b55ee3c74063bc9af22e734e4cbd85682fde (patch) | |
tree | 5cc6f5d9c8a1173b0a1e36987c62d134a57d6bfc /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Merge pull request #3023 from lioncash/opus (diff) | |
parent | maxwell_3d/kepler_compute: Remove unused arguments in GetTexture (diff) | |
download | yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.tar yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.tar.gz yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.tar.bz2 yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.tar.lz yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.tar.xz yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.tar.zst yuzu-2ec5b55ee3c74063bc9af22e734e4cbd85682fde.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 9431d64ac..43032e9a7 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -969,7 +969,7 @@ TextureBufferUsage RasterizerOpenGL::SetupDrawTextures(Maxwell::ShaderStage stag for (u32 bindpoint = 0; bindpoint < entries.size(); ++bindpoint) { const auto& entry = entries[bindpoint]; - const auto texture = [&]() { + const auto texture = [&] { if (!entry.IsBindless()) { return maxwell3d.GetStageTexture(stage, entry.GetOffset()); } @@ -977,7 +977,7 @@ TextureBufferUsage RasterizerOpenGL::SetupDrawTextures(Maxwell::ShaderStage stag Tegra::Texture::TextureHandle tex_handle; Tegra::Engines::ShaderType shader_type = static_cast<Tegra::Engines::ShaderType>(stage); tex_handle.raw = maxwell3d.AccessConstBuffer32(shader_type, cbuf.first, cbuf.second); - return maxwell3d.GetTextureInfo(tex_handle, entry.GetOffset()); + return maxwell3d.GetTextureInfo(tex_handle); }(); if (SetupTexture(base_bindings.sampler + bindpoint, texture, entry)) { @@ -1000,7 +1000,7 @@ TextureBufferUsage RasterizerOpenGL::SetupComputeTextures(const Shader& kernel) for (u32 bindpoint = 0; bindpoint < entries.size(); ++bindpoint) { const auto& entry = entries[bindpoint]; - const auto texture = [&]() { + const auto texture = [&] { if (!entry.IsBindless()) { return compute.GetTexture(entry.GetOffset()); } @@ -1008,7 +1008,7 @@ TextureBufferUsage RasterizerOpenGL::SetupComputeTextures(const Shader& kernel) Tegra::Texture::TextureHandle tex_handle; tex_handle.raw = compute.AccessConstBuffer32(Tegra::Engines::ShaderType::Compute, cbuf.first, cbuf.second); - return compute.GetTextureInfo(tex_handle, entry.GetOffset()); + return compute.GetTextureInfo(tex_handle); }(); if (SetupTexture(bindpoint, texture, entry)) { @@ -1046,7 +1046,7 @@ void RasterizerOpenGL::SetupComputeImages(const Shader& shader) { const auto& entries = shader->GetShaderEntries().images; for (u32 bindpoint = 0; bindpoint < entries.size(); ++bindpoint) { const auto& entry = entries[bindpoint]; - const auto tic = [&]() { + const auto tic = [&] { if (!entry.IsBindless()) { return compute.GetTexture(entry.GetOffset()).tic; } @@ -1054,7 +1054,7 @@ void RasterizerOpenGL::SetupComputeImages(const Shader& shader) { Tegra::Texture::TextureHandle tex_handle; tex_handle.raw = compute.AccessConstBuffer32(Tegra::Engines::ShaderType::Compute, cbuf.first, cbuf.second); - return compute.GetTextureInfo(tex_handle, entry.GetOffset()).tic; + return compute.GetTextureInfo(tex_handle).tic; }(); SetupImage(bindpoint, tic, entry); } |