diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 11:47:39 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-14 11:13:43 -0700 |
commit | 212ae5273dc3930a035b51c603c540b4f02fa777 (patch) | |
tree | 64e4c1b88515035fe379cb55ca0f2fcf724163e9 /src/mbgl/shaders/shaders.cpp | |
parent | a64828218a3934c036f7fb256b6799723c30830a (diff) | |
download | qtlocation-mapboxgl-212ae5273dc3930a035b51c603c540b4f02fa777.tar.gz |
[core] cleanup ProgramParameters
Diffstat (limited to 'src/mbgl/shaders/shaders.cpp')
-rw-r--r-- | src/mbgl/shaders/shaders.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/mbgl/shaders/shaders.cpp b/src/mbgl/shaders/shaders.cpp index 03d796edba..93e273f985 100644 --- a/src/mbgl/shaders/shaders.cpp +++ b/src/mbgl/shaders/shaders.cpp @@ -9,30 +9,12 @@ namespace mbgl { namespace shaders { -static std::string pixelRatioDefine(const ProgramParameters& parameters) { - std::ostringstream pixelRatioSS; - pixelRatioSS.imbue(std::locale("C")); - pixelRatioSS.setf(std::ios_base::showpoint); - pixelRatioSS << parameters.pixelRatio; - return std::string("#define DEVICE_PIXEL_RATIO ") + pixelRatioSS.str() + "\n"; -} - std::string fragmentSource(const ProgramParameters& parameters, const char* fragmentSource) { - std::string source = pixelRatioDefine(parameters) + fragmentPrelude + fragmentSource; - if (parameters.overdraw) { - assert(source.find("#ifdef OVERDRAW_INSPECTOR") != std::string::npos); - source.replace(source.find_first_of('\n'), 1, "\n#define OVERDRAW_INSPECTOR\n"); - } - return source; + return parameters.defines + fragmentPrelude + fragmentSource; } std::string vertexSource(const ProgramParameters& parameters, const char* vertexSource) { - return pixelRatioDefine(parameters) + vertexPrelude + vertexSource; -} - -std::string programCachePath(const ProgramParameters& parameters, const char* name) { - return parameters.cacheDir + "/com.mapbox.gl.shader." + name + - (parameters.overdraw ? ".overdraw.pbf" : ".pbf"); + return parameters.defines + vertexPrelude + vertexSource; } std::string programIdentifier(const std::string& vertexSource, const std::string& fragmentSource) { |