diff options
Diffstat (limited to 'src')
| -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() | |||
| 273 | if (MSVC) | 273 | if (MSVC) |
| 274 | target_compile_options(video_core PRIVATE /we4267) | 274 | target_compile_options(video_core PRIVATE /we4267) |
| 275 | else() | 275 | else() |
| 276 | target_compile_options(video_core PRIVATE -Werror=conversion -Wno-error=sign-conversion -Werror=switch) | 276 | target_compile_options(video_core PRIVATE |
| 277 | -Werror=conversion | ||
| 278 | -Wno-error=sign-conversion | ||
| 279 | -Werror=switch | ||
| 280 | -Werror=unused-variable | ||
| 281 | -Werror=unused-but-set-variable | ||
| 282 | ) | ||
| 277 | endif() | 283 | 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() { | |||
| 114 | const u32 block_depth = src_params.block_size.depth; | 114 | const u32 block_depth = src_params.block_size.depth; |
| 115 | const size_t src_size = | 115 | const size_t src_size = |
| 116 | CalculateSize(true, bytes_per_pixel, width, height, depth, block_height, block_depth); | 116 | CalculateSize(true, bytes_per_pixel, width, height, depth, block_height, block_depth); |
| 117 | const size_t src_layer_size = | ||
| 118 | CalculateSize(true, bytes_per_pixel, width, height, 1, block_height, block_depth); | ||
| 119 | 117 | ||
| 120 | if (read_buffer.size() < src_size) { | 118 | if (read_buffer.size() < src_size) { |
| 121 | read_buffer.resize(src_size); | 119 | 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() { | |||
| 193 | Device::Device() | 193 | Device::Device() |
| 194 | : max_uniform_buffers{BuildMaxUniformBuffers()}, base_bindings{BuildBaseBindings()} { | 194 | : max_uniform_buffers{BuildMaxUniformBuffers()}, base_bindings{BuildBaseBindings()} { |
| 195 | const std::string_view vendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); | 195 | const std::string_view vendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); |
| 196 | const std::string_view renderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER)); | ||
| 197 | const std::string_view version = reinterpret_cast<const char*>(glGetString(GL_VERSION)); | 196 | const std::string_view version = reinterpret_cast<const char*>(glGetString(GL_VERSION)); |
| 198 | const std::vector extensions = GetExtensions(); | 197 | const std::vector extensions = GetExtensions(); |
| 199 | 198 | ||