summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-11-07 03:41:32 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-11-08 00:43:31 +0100
commitbfa973a62b19e4707d0846027b57a31efe8433d7 (patch)
tree95ed02c560e75a06ddfe652ef598adf106e88232
parentMerge pull request #3032 from ReinUsesLisp/simplify-control-flow-brx (diff)
downloadyuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.tar
yuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.tar.gz
yuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.tar.bz2
yuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.tar.lz
yuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.tar.xz
yuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.tar.zst
yuzu-bfa973a62b19e4707d0846027b57a31efe8433d7.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index f1b89165d..35e5214a5 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -394,7 +394,8 @@ Shader CachedShader::CreateStageFromMemory(const ShaderParameters& params,
params.disk_cache.SaveRaw(ShaderDiskCacheRaw(
params.unique_identifier, GetProgramType(program_type), program_code, program_code_b));
- ConstBufferLocker locker(GetEnginesShaderType(GetProgramType(program_type)));
+ ConstBufferLocker locker(GetEnginesShaderType(GetProgramType(program_type)),
+ params.system.GPU().Maxwell3D());
const ShaderIR ir(program_code, STAGE_MAIN_OFFSET, COMPILER_SETTINGS, locker);
// TODO(Rodrigo): Handle VertexA shaders
// std::optional<ShaderIR> ir_b;
@@ -410,7 +411,8 @@ Shader CachedShader::CreateKernelFromMemory(const ShaderParameters& params, Prog
params.disk_cache.SaveRaw(
ShaderDiskCacheRaw(params.unique_identifier, ProgramType::Compute, code));
- ConstBufferLocker locker(Tegra::Engines::ShaderType::Compute);
+ ConstBufferLocker locker(Tegra::Engines::ShaderType::Compute,
+ params.system.GPU().KeplerCompute());
const ShaderIR ir(code, KERNEL_MAIN_OFFSET, COMPILER_SETTINGS, locker);
return std::shared_ptr<CachedShader>(new CachedShader(
params, ProgramType::Compute, GLShader::GetEntries(ir), std::move(code), {}));