diff options
| author | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-08-28 15:29:59 +0300 |
|---|---|---|
| committer | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-08-30 11:18:55 +0300 |
| commit | 4ba1270dcc0a51c7c68be2bfbac283ee76ea8680 (patch) | |
| tree | c10bd5ea423888f77bf82c5d9ca55e322b290ed8 /src/mbgl/programs/gl/line_pattern.cpp | |
| parent | 6ef2710e5cfb5ee4258583a20d55320e90faa8a5 (diff) | |
| download | qtlocation-mapboxgl-4ba1270dcc0a51c7c68be2bfbac283ee76ea8680.tar.gz | |
[core] DEMData: do decode on GPU (port mapbox/mapbox-gl-js#8694)
This is first part of work on porting mapbox/mapbox-gl-js#8694 - in follow up patch(es) it is required to remove CPU side copy using 2d canvas support on all supported platforms, similar to approach taken in gl.js https://github.com/mapbox/mapbox-gl-js/pull/8694/files#diff-34dbe5f7de34dc4b9a8745dcde9bdc37R48
Decoding on CPU removed.
Padding is still done in DEMData() but, instead od doing it wwhile decoding, it is using memcpy to pad original values.
Rebase to latest mapbox-gl-js master and re-generate shaders.
Partly fixes: #15503
Diffstat (limited to 'src/mbgl/programs/gl/line_pattern.cpp')
| -rw-r--r-- | src/mbgl/programs/gl/line_pattern.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/programs/gl/line_pattern.cpp b/src/mbgl/programs/gl/line_pattern.cpp index 96da8a4f2a..df34ac572b 100644 --- a/src/mbgl/programs/gl/line_pattern.cpp +++ b/src/mbgl/programs/gl/line_pattern.cpp @@ -16,8 +16,8 @@ template <> struct ShaderSource<LinePatternProgram> { static constexpr const char* name = "line_pattern"; static constexpr const uint8_t hash[8] = { 0x38, 0x9c, 0x3d, 0xde, 0xb4, 0xe0, 0xd1, 0x61 }; - static constexpr const auto vertexOffset = 37846; - static constexpr const auto fragmentOffset = 41240; + static constexpr const auto vertexOffset = 37858; + static constexpr const auto fragmentOffset = 41252; }; constexpr const char* ShaderSource<LinePatternProgram>::name; |