diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-10-03 02:19:35 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-10-03 02:19:35 +0200 |
commit | 2a24b1c9734a916e9a14579d4c550c84e83039b8 (patch) | |
tree | 8354ea4ead2047254115aea7408db184142273e7 | |
parent | Merge pull request #4734 from german77/motionfusion (diff) | |
download | yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.tar yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.tar.gz yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.tar.bz2 yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.tar.lz yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.tar.xz yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.tar.zst yuzu-2a24b1c9734a916e9a14579d4c550c84e83039b8.zip |
-rw-r--r-- | src/video_core/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_dma.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_device.cpp | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index da9e9fdda..2be455679 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -273,5 +273,11 @@ endif() if (MSVC) target_compile_options(video_core PRIVATE /we4267) else() - target_compile_options(video_core PRIVATE -Werror=conversion -Wno-error=sign-conversion -Werror=switch) + target_compile_options(video_core PRIVATE + -Werror=conversion + -Wno-error=sign-conversion + -Werror=switch + -Werror=unused-variable + -Werror=unused-but-set-variable + ) endif() diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index e88290754..8fa359d0a 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -114,8 +114,6 @@ void MaxwellDMA::CopyBlockLinearToPitch() { const u32 block_depth = src_params.block_size.depth; const size_t src_size = CalculateSize(true, bytes_per_pixel, width, height, depth, block_height, block_depth); - const size_t src_layer_size = - CalculateSize(true, bytes_per_pixel, width, height, 1, block_height, block_depth); if (read_buffer.size() < src_size) { read_buffer.resize(src_size); diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index e7d95149f..a94e4f72e 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -193,7 +193,6 @@ bool IsASTCSupported() { Device::Device() : max_uniform_buffers{BuildMaxUniformBuffers()}, base_bindings{BuildBaseBindings()} { const std::string_view vendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); - const std::string_view renderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER)); const std::string_view version = reinterpret_cast<const char*>(glGetString(GL_VERSION)); const std::vector extensions = GetExtensions(); |