diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-02 14:11:37 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-15 11:57:43 -0700 |
commit | da5bd4d6e3a0202cc4f9e4d3d17e159eb90acba6 (patch) | |
tree | 9450b28ea53804129de6cc049404bbef2b83778c /src/mbgl/programs | |
parent | d5e7fabf455d3e8e6cb852fa544649c8012d70ed (diff) | |
download | qtlocation-mapboxgl-da5bd4d6e3a0202cc4f9e4d3d17e159eb90acba6.tar.gz |
[core] use unique IDs for DrawScopes
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r-- | src/mbgl/programs/gl/shaders.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/programs/program_parameters.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/programs/gl/shaders.cpp b/src/mbgl/programs/gl/shaders.cpp index 6fb4d70db9..e8c9bdfc3c 100644 --- a/src/mbgl/programs/gl/shaders.cpp +++ b/src/mbgl/programs/gl/shaders.cpp @@ -16,8 +16,8 @@ std::string programIdentifier(const std::string& defines1, const uint8_t hash2[8]) { std::string result; result.reserve(8 + 8 + (sizeof(size_t) * 2) * 2 + 2); - result.append(util::toHex(std::hash<std::string>()(defines1))); - result.append(util::toHex(std::hash<std::string>()(defines2))); + result.append(util::toHex(static_cast<uint64_t>(std::hash<std::string>()(defines1)))); + result.append(util::toHex(static_cast<uint64_t>(std::hash<std::string>()(defines2)))); result.append(hash1, hash2 + 8); result.append(hash2, hash2 + 8); result.append("v3"); diff --git a/src/mbgl/programs/program_parameters.cpp b/src/mbgl/programs/program_parameters.cpp index e692b74e0e..a49dc2bc88 100644 --- a/src/mbgl/programs/program_parameters.cpp +++ b/src/mbgl/programs/program_parameters.cpp @@ -34,7 +34,7 @@ optional<std::string> ProgramParameters::cachePath(const char* name) const { result += "/com.mapbox.gl.shader."; result += name; result += '.'; - result += util::toHex(std::hash<std::string>()(defines)); + result += util::toHex(static_cast<uint64_t>(std::hash<std::string>()(defines))); result += ".pbf"; return result; } |