diff options
| author | 2019-07-15 20:33:51 -0300 | |
|---|---|---|
| committer | 2019-07-15 20:33:51 -0300 | |
| commit | 2a4044a85877f6b1c3c91fcfe7242a162bee6ccb (patch) | |
| tree | 2467cb1fbe3842584218f08a88afbdba8d33f46f | |
| parent | gl_shader_decompiler: Stub local memory size (diff) | |
| download | yuzu-2a4044a85877f6b1c3c91fcfe7242a162bee6ccb.tar.gz yuzu-2a4044a85877f6b1c3c91fcfe7242a162bee6ccb.tar.xz yuzu-2a4044a85877f6b1c3c91fcfe7242a162bee6ccb.zip | |
gl_shader_cache: Fix clang-format issues
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 4890d4a73..865c191bd 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp | |||
| @@ -323,8 +323,7 @@ Shader CachedShader::CreateStageFromCache(const ShaderParameters& params, | |||
| 323 | new CachedShader(params, GetProgramType(program_type), std::move(result))); | 323 | new CachedShader(params, GetProgramType(program_type), std::move(result))); |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | Shader CachedShader::CreateKernelFromMemory(const ShaderParameters& params, | 326 | Shader CachedShader::CreateKernelFromMemory(const ShaderParameters& params, ProgramCode&& code) { |
| 327 | ProgramCode&& code) { | ||
| 328 | auto result{CreateProgram(params.device, ProgramType::Compute, code, {})}; | 327 | auto result{CreateProgram(params.device, ProgramType::Compute, code, {})}; |
| 329 | 328 | ||
| 330 | const auto code_size{CalculateProgramSize(code)}; | 329 | const auto code_size{CalculateProgramSize(code)}; |
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h index 5e86c6648..a3106a0ff 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_cache.h | |||
| @@ -55,8 +55,7 @@ class CachedShader final : public RasterizerCacheObject { | |||
| 55 | public: | 55 | public: |
| 56 | static Shader CreateStageFromMemory(const ShaderParameters& params, | 56 | static Shader CreateStageFromMemory(const ShaderParameters& params, |
| 57 | Maxwell::ShaderProgram program_type, | 57 | Maxwell::ShaderProgram program_type, |
| 58 | ProgramCode&& program_code, | 58 | ProgramCode&& program_code, ProgramCode&& program_code_b); |
| 59 | ProgramCode&& program_code_b); | ||
| 60 | 59 | ||
| 61 | static Shader CreateStageFromCache(const ShaderParameters& params, | 60 | static Shader CreateStageFromCache(const ShaderParameters& params, |
| 62 | Maxwell::ShaderProgram program_type, | 61 | Maxwell::ShaderProgram program_type, |