diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-08-30 20:08:00 +0200 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-08-30 20:08:00 +0200 |
commit | 4d4f9cc104c9440de36e3ff3f6b374acd8074885 (patch) | |
tree | ec9d52b39ac1da86866b5d6c5b592d8ddb324efd /src/video_core/renderer_opengl | |
parent | Merge pull request #2819 from ReinUsesLisp/fixup-clang (diff) | |
download | yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.gz yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.bz2 yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.lz yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.xz yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.tar.zst yuzu-4d4f9cc104c9440de36e3ff3f6b374acd8074885.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
4 files changed, 2 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 019583718..bb09ecd52 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -708,8 +708,6 @@ void RasterizerOpenGL::DrawArrays() { return; } - const auto& regs = gpu.regs; - SyncColorMask(); SyncFragmentColorClampState(); SyncMultiSampleState(); diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index c39626850..cf6a5cddf 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -295,7 +295,7 @@ std::set<GLenum> GetSupportedFormats() { CachedShader::CachedShader(const ShaderParameters& params, ProgramType program_type, GLShader::ProgramResult result) - : RasterizerCacheObject{params.host_ptr}, host_ptr{params.host_ptr}, cpu_addr{params.cpu_addr}, + : RasterizerCacheObject{params.host_ptr}, cpu_addr{params.cpu_addr}, unique_identifier{params.unique_identifier}, program_type{program_type}, disk_cache{params.disk_cache}, precompiled_programs{params.precompiled_programs}, entries{result.second}, code{std::move(result.first)}, shader_length{entries.shader_length} {} diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h index a3106a0ff..2c8faf855 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_cache.h @@ -106,7 +106,6 @@ private: ShaderDiskCacheUsage GetUsage(const ProgramVariant& variant) const; - u8* host_ptr{}; VAddr cpu_addr{}; u64 unique_identifier{}; ProgramType program_type{}; diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index ff6ab6988..21324488a 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -51,7 +51,7 @@ public: } protected: - void DecorateSurfaceName(); + void DecorateSurfaceName() override; View CreateView(const ViewParams& view_key) override; View CreateViewInner(const ViewParams& view_key, bool is_proxy); |