diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-11-21 11:53:39 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-02 17:11:49 +0200 |
| commit | 84ec3794770168f30e2e8612af41940cc409d554 (patch) | |
| tree | 0840f2c382d18484e789c2d2d12157c34765ac59 | |
| parent | 72e9388a61fa1f346043da594d33d2881f7aa329 (diff) | |
| download | qtlocation-mapboxgl-84ec3794770168f30e2e8612af41940cc409d554.tar.gz | |
[core] Turn off clang format for generated shaded code
| -rwxr-xr-x | scripts/generate-shaders.js | 5 | ||||
| -rw-r--r-- | src/mbgl/programs/gl/shader_source.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index 69cdb5bb28..4816b89d3e 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -98,7 +98,7 @@ struct ShaderSource; `); writeIfModified(path.join(outputPath, 'gl', 'shader_source.cpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include <mbgl/programs/gl/shader_source.hpp> #include <mbgl/util/compression.hpp> @@ -108,10 +108,8 @@ namespace mbgl { namespace programs { namespace gl { -// clang-format off constexpr const uint8_t compressedShaderSource[] = { ${compressed}}; -// clang-format on const char* shaderSource() { static std::string decompressed = util::decompress(std::string(reinterpret_cast<const char*>(compressedShaderSource), sizeof(compressedShaderSource))); @@ -121,6 +119,7 @@ const char* shaderSource() { } // namespace gl } // namespace programs } // namespace mbgl +// clang-format on `); writeIfModified(path.join(outputPath, 'gl', 'preludes.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. diff --git a/src/mbgl/programs/gl/shader_source.cpp b/src/mbgl/programs/gl/shader_source.cpp index 0c489d1e1e..c106cff1f2 100644 --- a/src/mbgl/programs/gl/shader_source.cpp +++ b/src/mbgl/programs/gl/shader_source.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include <mbgl/programs/gl/shader_source.hpp> #include <mbgl/util/compression.hpp> @@ -9,7 +9,6 @@ namespace mbgl { namespace programs { namespace gl { -// clang-format off constexpr const uint8_t compressedShaderSource[] = { 0x78, 0xda, 0xed, 0x3d, 0x6b, 0x6f, 0xe3, 0x38, 0x92, 0xfb, 0x39, 0xbf, 0xc2, 0x83, 0x01, 0x16, 0x92, 0x2c, 0x5b, 0xb6, 0x93, 0xf4, 0x4b, 0xab, 0x1b, 0x34, 0xba, 0x33, 0x73, 0x01, 0x66, 0xba, @@ -473,7 +472,6 @@ constexpr const uint8_t compressedShaderSource[] = { 0xc3, 0xff, 0xf0, 0x83, 0xbf, 0xf3, 0x14, 0x61, 0x9d, 0x62, 0xbd, 0xd6, 0xe2, 0xed, 0xdf, 0x6c, 0xb7, 0x60, 0xd7, 0x9d, 0x01, 0x83, 0xb2, 0x57, 0x3b, 0xfa, 0x6b, 0x47, 0x3f, 0x75, 0xf4, 0xff, 0x3f, 0x32, 0x8d, 0x17, 0xbd}; -// clang-format on const char* shaderSource() { static std::string decompressed = util::decompress(std::string(reinterpret_cast<const char*>(compressedShaderSource), sizeof(compressedShaderSource))); @@ -483,3 +481,4 @@ const char* shaderSource() { } // namespace gl } // namespace programs } // namespace mbgl +// clang-format on |