diff options
author | Ander Conselvan de Oliveira <ander.deoliveira@mapbox.com> | 2019-08-27 14:25:55 +0300 |
---|---|---|
committer | Ander Conselvan de Oliveira <ander.deoliveira@mapbox.com> | 2019-08-27 16:23:48 +0300 |
commit | 21632a66f83e1e42bf6383f877d85a4fab4ad273 (patch) | |
tree | 9816cd8893accd71dc1d98ec9b20f40bd0cdd967 /src/mbgl/programs/program_parameters.cpp | |
parent | 2c796a72aaa74d3fe91daeb90470073d1cf1f808 (diff) | |
download | qtlocation-mapboxgl-21632a66f83e1e42bf6383f877d85a4fab4ad273.tar.gz |
[core] Remove programCacheDir parameter from ProgramParameters
Binary shader support has been removed in commit c2f974f2a573 ([core]
Remove binary shader support). This left-over parameter is not used
anywhere anymore.
Diffstat (limited to 'src/mbgl/programs/program_parameters.cpp')
-rw-r--r-- | src/mbgl/programs/program_parameters.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/mbgl/programs/program_parameters.cpp b/src/mbgl/programs/program_parameters.cpp index a49dc2bc88..95d2d0f668 100644 --- a/src/mbgl/programs/program_parameters.cpp +++ b/src/mbgl/programs/program_parameters.cpp @@ -4,8 +4,7 @@ namespace mbgl { ProgramParameters::ProgramParameters(const float pixelRatio, - const bool overdraw, - optional<std::string> cacheDir_) + const bool overdraw) : defines([&] { std::string result; result.reserve(32); @@ -16,28 +15,11 @@ ProgramParameters::ProgramParameters(const float pixelRatio, result += "#define OVERDRAW_INSPECTOR\n"; } return result; - }()), - cacheDir(std::move(cacheDir_)) { + }()) { } const std::string& ProgramParameters::getDefines() const { return defines; } -optional<std::string> ProgramParameters::cachePath(const char* name) const { - if (!cacheDir) { - return {}; - } else { - std::string result; - result.reserve(cacheDir->length() + 64); - result += *cacheDir; - result += "/com.mapbox.gl.shader."; - result += name; - result += '.'; - result += util::toHex(static_cast<uint64_t>(std::hash<std::string>()(defines))); - result += ".pbf"; - return result; - } -} - } // namespace mbgl |