summaryrefslogtreecommitdiff
path: root/servers/visual/rasterizer_rd/shader_rd.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-02-18 14:57:11 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-02-18 20:51:25 +0100
commit49fec646cbf3afdf5e7d55589ab359a5ebcdb897 (patch)
treef5e52fb159af51e1e3f4872415fc201c345fbad5 /servers/visual/rasterizer_rd/shader_rd.h
parente866b4043c0fc14700672713a91ec4a86c667607 (diff)
Fix compilation warnings and re-enable werror=yes on Travis
Fix -Wunused-variable, -Wunused-but-set-variable and -Wswitch warnings raised by GCC 8 and 9. Fix -Wunused-function, -Wunused-private-field and -Wtautological-constant-out-of-range-compare raised by Clang. Fix MSVC 2019 warning C4804 (unsafe use of type 'bool' in comparison operation). GCC -Wcpp warnings/Clang -W#warnings (`#warning`) are no longer raising errors and will thus not abort compilation with `werror=yes`. Treat glslang headers are system headers to avoid raising warnings. Re-enables us to build with `werror=yes` on Linux and macOS, thus catching warnings that would be introduced by new code. Fixes #36132.
Diffstat (limited to 'servers/visual/rasterizer_rd/shader_rd.h')
-rw-r--r--servers/visual/rasterizer_rd/shader_rd.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/servers/visual/rasterizer_rd/shader_rd.h b/servers/visual/rasterizer_rd/shader_rd.h
index dce46fc0b5..8581b85ff4 100644
--- a/servers/visual/rasterizer_rd/shader_rd.h
+++ b/servers/visual/rasterizer_rd/shader_rd.h
@@ -35,6 +35,7 @@
#include "core/map.h"
#include "core/rid_owner.h"
#include "core/variant.h"
+
#include <stdio.h>
#include <mutex>
/**
@@ -47,11 +48,7 @@ class ShaderRD {
CharString general_defines;
Vector<CharString> variant_defines;
- int vertex_code_start;
- int fragment_code_start;
-
struct Version {
-
CharString uniforms;
CharString vertex_globals;
CharString vertex_code;