diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-05 12:15:27 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 12:21:50 -0700 |
| commit | 9d276f3b0f0e5f1b5089a6cd727927361e6634ac (patch) | |
| tree | bbf0c446055126f060e8ee759b7b71281dea8f80 /src/mbgl/shaders | |
| parent | 18b50f51b4fa14b9f2fe6f865dc47490b22e74c6 (diff) | |
| download | qtlocation-mapboxgl-9d276f3b0f0e5f1b5089a6cd727927361e6634ac.tar.gz | |
[core] Dynamic program compilation for data-driven properties
Diffstat (limited to 'src/mbgl/shaders')
| -rw-r--r-- | src/mbgl/shaders/shaders.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/shaders/shaders.cpp b/src/mbgl/shaders/shaders.cpp index 93e273f985..31ff405f02 100644 --- a/src/mbgl/shaders/shaders.cpp +++ b/src/mbgl/shaders/shaders.cpp @@ -10,11 +10,11 @@ namespace mbgl { namespace shaders { std::string fragmentSource(const ProgramParameters& parameters, const char* fragmentSource) { - return parameters.defines + fragmentPrelude + fragmentSource; + return parameters.getDefines() + fragmentPrelude + fragmentSource; } std::string vertexSource(const ProgramParameters& parameters, const char* vertexSource) { - return parameters.defines + vertexPrelude + vertexSource; + return parameters.getDefines() + vertexPrelude + vertexSource; } std::string programIdentifier(const std::string& vertexSource, const std::string& fragmentSource) { |