diff options
author | Mat M <mathew1800@gmail.com> | 2019-05-14 12:36:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-14 12:36:26 +0200 |
commit | dadcf317dc38e94c9f72ab6d897da91b04ec84c6 (patch) | |
tree | ed230c56d70c233cd24f44fab8ac15dde19563e8 /src/video_core/renderer_opengl | |
parent | Merge pull request #2460 from lioncash/volatile (diff) | |
parent | video_core/renderer_opengl/gl_shader_cache: Correct member initialization order (diff) | |
download | yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.tar yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.tar.gz yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.tar.bz2 yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.tar.lz yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.tar.xz yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.tar.zst yuzu-dadcf317dc38e94c9f72ab6d897da91b04ec84c6.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 1 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 11 |
3 files changed, 1 insertions, 13 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 7d8fb670e..a7681902e 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -805,7 +805,6 @@ void CachedSurface::UploadGLMipmapTexture(RasterizerTemporaryMemory& res_cache_t 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<GLint>(face), static_cast<GLsizei>(rect.GetWidth()), 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) { 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 <Type type> std::string Add(Operation operation) { return GenerateBinaryInfix(operation, "+", type, type, type); |