H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4771 from ReinUsesLisp/warn-unused-var

Browse Source 
video_core: Enforce -Wunused-variable and -Wunused-but-set-variable
This commit is contained in:
LC 2020-10-08 21:10:31 -04:00 committed by GitHub
commit 61b246a3a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_core/CMakeLists.txt
View File

@ -273,5 +273,11 @@ endif()
if (MSVC) if (MSVC)
target_compile_options(video_core PRIVATE /we4267) target_compile_options(video_core PRIVATE /we4267)
else() 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() endif()

2
src/video_core/engines/maxwell_dma.cpp
View File

@ -114,8 +114,6 @@ void MaxwellDMA::CopyBlockLinearToPitch() {
const u32 block_depth = src_params.block_size.depth; const u32 block_depth = src_params.block_size.depth;
const size_t src_size = const size_t src_size =
CalculateSize(true, bytes_per_pixel, width, height, depth, block_height, block_depth); 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) { if (read_buffer.size() < src_size) {
read_buffer.resize(src_size); read_buffer.resize(src_size);

1
src/video_core/renderer_opengl/gl_device.cpp
View File

@ -193,7 +193,6 @@ bool IsASTCSupported() {
Device::Device() Device::Device()
: max_uniform_buffers{BuildMaxUniformBuffers()}, base_bindings{BuildBaseBindings()} { : max_uniform_buffers{BuildMaxUniformBuffers()}, base_bindings{BuildBaseBindings()} {
const std::string_view vendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); 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::string_view version = reinterpret_cast<const char*>(glGetString(GL_VERSION));
const std::vector extensions = GetExtensions(); const std::vector extensions = GetExtensions();