diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 21:14:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 21:14:28 +0100 |
| commit | b967c910b88ed0cf134749464dcec7f4311e19f4 (patch) | |
| tree | dcf63119d2b917452f8c2b6ce01787eeee02273a /servers/visual/rasterizer_rd/shader_rd.h | |
| parent | 7d691c1812a42d8aafafc2733d59723aa622f44b (diff) | |
| parent | 49fec646cbf3afdf5e7d55589ab359a5ebcdb897 (diff) | |
Merge pull request #36327 from akien-mga/fix-warnings-reenable-werror
Fix compilation warnings and re-enable werror=yes on Travis
Diffstat (limited to 'servers/visual/rasterizer_rd/shader_rd.h')
| -rw-r--r-- | servers/visual/rasterizer_rd/shader_rd.h | 5 |
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; |