diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-19 14:02:10 +0100 |
---|---|---|
committer | Alf Watt <alf.watt@mapbox.com> | 2019-03-21 12:25:11 -0700 |
commit | bf9e76c1cb2f6b0e1f6bc824d5c2d822595158b7 (patch) | |
tree | e88f9a2ffc25f8cac58382dec234b8023ed023c8 /src/mbgl/programs/gl/shaders.hpp | |
parent | 19d70f5be90fdf1e269b99f0a9e253dcca839cf9 (diff) | |
download | qtlocation-mapboxgl-bf9e76c1cb2f6b0e1f6bc824d5c2d822595158b7.tar.gz |
[core] move ProgramMap to within the gl::Program object
Diffstat (limited to 'src/mbgl/programs/gl/shaders.hpp')
-rw-r--r-- | src/mbgl/programs/gl/shaders.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/programs/gl/shaders.hpp b/src/mbgl/programs/gl/shaders.hpp index 5278ea54da..46a87f4af8 100644 --- a/src/mbgl/programs/gl/shaders.hpp +++ b/src/mbgl/programs/gl/shaders.hpp @@ -9,9 +9,10 @@ class ProgramParameters; namespace programs { namespace gl { -std::string fragmentSource(const ProgramParameters&, const char* fragmentSource); -std::string vertexSource(const ProgramParameters&, const char* vertexSource); -std::string programIdentifier(const std::string& vertexSource, const std::string& fragmentSource); +std::string programIdentifier(const std::string& defines1, + const std::string& defines2, + const uint8_t hash1[8], + const uint8_t hash2[8]); } // namespace gl } // namespace programs |