diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-10-28 06:31:05 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-10-30 00:53:48 +0100 |
commit | a993df1ee294b861eef4f35fccabeecd05754f2a (patch) | |
tree | 04150cb66c138c75f6a4fc47218bb2255af7e234 /src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |
parent | Merge pull request #3004 from ReinUsesLisp/maxwell3d-cleanup (diff) | |
download | yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.tar yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.tar.gz yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.tar.bz2 yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.tar.lz yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.tar.xz yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.tar.zst yuzu-a993df1ee294b861eef4f35fccabeecd05754f2a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 030550c53..92ee8459e 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -735,7 +735,7 @@ private: void DeclareImages() { const auto& images{ir.GetImages()}; - for (const auto& [offset, image] : images) { + for (const auto& image : images) { std::string qualifier = "coherent volatile"; if (image.IsRead() && !image.IsWritten()) { qualifier += " readonly"; @@ -2466,16 +2466,16 @@ ShaderEntries GetEntries(const VideoCommon::Shader::ShaderIR& ir) { entries.const_buffers.emplace_back(cbuf.second.GetMaxOffset(), cbuf.second.IsIndirect(), cbuf.first); } + for (const auto& [base, usage] : ir.GetGlobalMemory()) { + entries.global_memory_entries.emplace_back(base.cbuf_index, base.cbuf_offset, usage.is_read, + usage.is_written); + } for (const auto& sampler : ir.GetSamplers()) { entries.samplers.emplace_back(sampler); } - for (const auto& [offset, image] : ir.GetImages()) { + for (const auto& image : ir.GetImages()) { entries.images.emplace_back(image); } - for (const auto& [base, usage] : ir.GetGlobalMemory()) { - entries.global_memory_entries.emplace_back(base.cbuf_index, base.cbuf_offset, usage.is_read, - usage.is_written); - } entries.clip_distances = ir.GetClipDistances(); entries.shader_length = ir.GetLength(); return entries; |