summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-11-09 19:58:36 +0100
committerGitHub <noreply@github.com>2019-11-09 19:58:36 +0100
commit0fc596de6e6fc8567dd125042799f8bd8bcb05a3 (patch)
tree1a93e1cfa52c2520eab9964d446fb19d2916a47a
parentMerge pull request #3080 from FernandoS27/glsl-fix (diff)
parentgl_shader_cache: Fix locker constructors (diff)
downloadyuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.tar
yuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.tar.gz
yuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.tar.bz2
yuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.tar.lz
yuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.tar.xz
yuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.tar.zst
yuzu-0fc596de6e6fc8567dd125042799f8bd8bcb05a3.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), {}));