From 6d28d288a31ad31324615c9f9bb1b0d151d37cd7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 18:42:02 -0400 Subject: video_core/renderer_opengl/gl_rasterizer_cache: Remove unused variable in UploadGLMipmapTexture() This variable is unused entirely, so it can be removed. --- src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 5a25f5b37..bdb822c20 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -801,7 +801,6 @@ void CachedSurface::UploadGLMipmapTexture(u32 mip_map, GLuint read_fb_handle, tuple.type, &gl_buffer[mip_map][buffer_offset]); break; case SurfaceTarget::TextureCubemap: { - std::size_t start = buffer_offset; for (std::size_t face = 0; face < params.depth; ++face) { glTextureSubImage3D(texture.handle, mip_map, x0, y0, static_cast(face), static_cast(rect.GetWidth()), -- cgit v1.2.3 From 175fe8aaebfd04e17e13bd2520598645b35c3167 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 18:45:24 -0400 Subject: video_core/renderer_opengl/gl_shader_decompiler: Remove unused Composite() function This isn't used at all, so it can be removed. --- src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index ef1a1995f..1a62795e1 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -871,17 +871,6 @@ private: return {}; } - std::string Composite(Operation operation) { - std::string value = "vec4("; - for (std::size_t i = 0; i < 4; ++i) { - value += Visit(operation[i]); - if (i < 3) - value += ", "; - } - value += ')'; - return value; - } - template std::string Add(Operation operation) { return GenerateBinaryInfix(operation, "+", type, type, type); -- cgit v1.2.3 From b6408e9671fd3e238534c2a0bac3355f68646576 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 18:55:45 -0400 Subject: video_core/renderer_opengl/gl_shader_cache: Correct member initialization order Silences a -Wreorder warning. --- src/video_core/renderer_opengl/gl_shader_cache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index b1c8f7c35..f700dc89a 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -345,7 +345,7 @@ ShaderDiskCacheUsage CachedShader::GetUsage(GLenum primitive_mode, ShaderCacheOpenGL::ShaderCacheOpenGL(RasterizerOpenGL& rasterizer, Core::System& system, const Device& device) - : RasterizerCache{rasterizer}, disk_cache{system}, device{device} {} + : RasterizerCache{rasterizer}, device{device}, disk_cache{system} {} void ShaderCacheOpenGL::LoadDiskCache(const std::atomic_bool& stop_loading, const VideoCore::DiskResourceLoadCallback& callback) { -- cgit v1.2.3