diff options
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r-- | src/mbgl/programs/program_parameters.cpp | 22 | ||||
-rw-r--r-- | src/mbgl/programs/program_parameters.hpp | 4 |
2 files changed, 3 insertions, 23 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 diff --git a/src/mbgl/programs/program_parameters.hpp b/src/mbgl/programs/program_parameters.hpp index 71ad454399..8af7ab50c0 100644 --- a/src/mbgl/programs/program_parameters.hpp +++ b/src/mbgl/programs/program_parameters.hpp @@ -8,14 +8,12 @@ namespace mbgl { class ProgramParameters { public: - ProgramParameters(float pixelRatio, bool overdraw, optional<std::string> cacheDir); + ProgramParameters(float pixelRatio, bool overdraw); const std::string& getDefines() const; - optional<std::string> cachePath(const char* name) const; private: std::string defines; - optional<std::string> cacheDir; }; } // namespace mbgl |