diff options
| author | bunnei <bunneidev@gmail.com> | 2019-07-04 09:03:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 09:03:44 +0200 |
| commit | cca663792f93b03382c62392655b01a21e8e388b (patch) | |
| tree | 2b9d73edd3076c950b93f3b6eb24c526e7d24c5e /src/video_core/renderer_opengl/gl_shader_cache.cpp | |
| parent | Merge pull request #2658 from ogniK5377/QueryAudioDeviceOutputEvent (diff) | |
| parent | gl_shader_cache: Make CachedShader constructor private (diff) | |
| download | yuzu-cca663792f93b03382c62392655b01a21e8e388b.tar yuzu-cca663792f93b03382c62392655b01a21e8e388b.tar.gz yuzu-cca663792f93b03382c62392655b01a21e8e388b.tar.bz2 yuzu-cca663792f93b03382c62392655b01a21e8e388b.tar.lz yuzu-cca663792f93b03382c62392655b01a21e8e388b.tar.xz yuzu-cca663792f93b03382c62392655b01a21e8e388b.tar.zst yuzu-cca663792f93b03382c62392655b01a21e8e388b.zip | |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_cache.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 |
1 files changed, 2 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 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, |