summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-07-04 02:39:46 +0200
committerZach Hilman <zachhilman@gmail.com>2019-07-04 02:39:46 +0200
commitad50cd7df95ec91d11c84a7b4711836838860560 (patch)
tree0da63ac6691bef831bfcd9e3b9d3ed3195478177
parentMerge pull request #2613 from ogniK5377/InitalizeApplicationInfo (diff)
downloadyuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar
yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.gz
yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.bz2
yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.lz
yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.xz
yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.zst
yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 2d78e2b60..8d3d7bfdc 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -245,13 +245,13 @@ Shader CachedShader::CreateStageFromMemory(const ShaderParameters& params,
static_cast<u32>(code_size_b / sizeof(u64)), std::move(program_code),
std::move(program_code_b)));
- return std::make_shared<CachedShader>(params, program_type, std::move(result));
+ return std::shared_ptr<CachedShader>(new CachedShader(params, program_type, std::move(result)));
}
Shader CachedShader::CreateStageFromCache(const ShaderParameters& params,
Maxwell::ShaderProgram program_type,
GLShader::ProgramResult result) {
- return std::make_shared<CachedShader>(params, program_type, std::move(result));
+ return std::shared_ptr<CachedShader>(new CachedShader(params, program_type, std::move(result)));
}
std::tuple<GLuint, BaseBindings> CachedShader::GetProgramHandle(GLenum primitive_mode,
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h
index 964f680bc..01af9b28a 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.h
+++ b/src/video_core/renderer_opengl/gl_shader_cache.h
@@ -52,9 +52,6 @@ struct ShaderParameters {
class CachedShader final : public RasterizerCacheObject {
public:
- explicit CachedShader(const ShaderParameters& params, Maxwell::ShaderProgram program_type,
- GLShader::ProgramResult result);
-
static Shader CreateStageFromMemory(const ShaderParameters& params,
Maxwell::ShaderProgram program_type,
ProgramCode&& program_code, ProgramCode&& program_code_b);
@@ -81,6 +78,9 @@ public:
BaseBindings base_bindings);
private:
+ explicit CachedShader(const ShaderParameters& params, Maxwell::ShaderProgram program_type,
+ GLShader::ProgramResult result);
+
// Geometry programs. These are needed because GLSL needs an input topology but it's not
// declared by the hardware. Workaround this issue by generating a different shader per input
// topology class.