diff options
| author | 2019-07-03 20:39:46 -0400 | |
|---|---|---|
| committer | 2019-07-03 20:39:46 -0400 | |
| commit | ad50cd7df95ec91d11c84a7b4711836838860560 (patch) | |
| tree | 0da63ac6691bef831bfcd9e3b9d3ed3195478177 /src | |
| parent | Merge pull request #2613 from ogniK5377/InitalizeApplicationInfo (diff) | |
| download | yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.gz yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.tar.xz yuzu-ad50cd7df95ec91d11c84a7b4711836838860560.zip | |
gl_shader_cache: Make CachedShader constructor private
Fixes missing review comments introduced.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.h | 6 |
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, | |||
| 245 | static_cast<u32>(code_size_b / sizeof(u64)), std::move(program_code), | 245 | static_cast<u32>(code_size_b / sizeof(u64)), std::move(program_code), |
| 246 | std::move(program_code_b))); | 246 | std::move(program_code_b))); |
| 247 | 247 | ||
| 248 | return std::make_shared<CachedShader>(params, program_type, std::move(result)); | 248 | return std::shared_ptr<CachedShader>(new CachedShader(params, program_type, std::move(result))); |
| 249 | } | 249 | } |
| 250 | 250 | ||
| 251 | Shader CachedShader::CreateStageFromCache(const ShaderParameters& params, | 251 | Shader CachedShader::CreateStageFromCache(const ShaderParameters& params, |
| 252 | Maxwell::ShaderProgram program_type, | 252 | Maxwell::ShaderProgram program_type, |
| 253 | GLShader::ProgramResult result) { | 253 | GLShader::ProgramResult result) { |
| 254 | return std::make_shared<CachedShader>(params, program_type, std::move(result)); | 254 | return std::shared_ptr<CachedShader>(new CachedShader(params, program_type, std::move(result))); |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | std::tuple<GLuint, BaseBindings> CachedShader::GetProgramHandle(GLenum primitive_mode, | 257 | 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 { | |||
| 52 | 52 | ||
| 53 | class CachedShader final : public RasterizerCacheObject { | 53 | class CachedShader final : public RasterizerCacheObject { |
| 54 | public: | 54 | public: |
| 55 | explicit CachedShader(const ShaderParameters& params, Maxwell::ShaderProgram program_type, | ||
| 56 | GLShader::ProgramResult result); | ||
| 57 | |||
| 58 | static Shader CreateStageFromMemory(const ShaderParameters& params, | 55 | static Shader CreateStageFromMemory(const ShaderParameters& params, |
| 59 | Maxwell::ShaderProgram program_type, | 56 | Maxwell::ShaderProgram program_type, |
| 60 | ProgramCode&& program_code, ProgramCode&& program_code_b); | 57 | ProgramCode&& program_code, ProgramCode&& program_code_b); |
| @@ -81,6 +78,9 @@ public: | |||
| 81 | BaseBindings base_bindings); | 78 | BaseBindings base_bindings); |
| 82 | 79 | ||
| 83 | private: | 80 | private: |
| 81 | explicit CachedShader(const ShaderParameters& params, Maxwell::ShaderProgram program_type, | ||
| 82 | GLShader::ProgramResult result); | ||
| 83 | |||
| 84 | // Geometry programs. These are needed because GLSL needs an input topology but it's not | 84 | // Geometry programs. These are needed because GLSL needs an input topology but it's not |
| 85 | // declared by the hardware. Workaround this issue by generating a different shader per input | 85 | // declared by the hardware. Workaround this issue by generating a different shader per input |
| 86 | // topology class. | 86 | // topology class. |