diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-18 15:32:49 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-20 13:24:20 +0300 |
commit | 76fc07c606fa62fefc1e2aa435a51a8b5fd384cd (patch) | |
tree | f95d3a09f6f58df952340809b104e25a6fb033a7 /src/mbgl/shader/shader.hpp | |
parent | 760a692378a8ae7c9cc87246c10f2fe9a64117bd (diff) | |
download | qtlocation-mapboxgl-76fc07c606fa62fefc1e2aa435a51a8b5fd384cd.tar.gz |
[core] Autogenerate Shader name
Diffstat (limited to 'src/mbgl/shader/shader.hpp')
-rw-r--r-- | src/mbgl/shader/shader.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp index 1cb2a5601f..3ba1e044c7 100644 --- a/src/mbgl/shader/shader.hpp +++ b/src/mbgl/shader/shader.hpp @@ -8,10 +8,8 @@ namespace mbgl { class Shader : private util::noncopyable { public: - Shader(const GLchar *name, const GLchar *vertex, const GLchar *fragment, gl::ObjectStore&); - ~Shader(); - const GLchar *name; + const char* name; GLuint getID() const { return program.get(); @@ -20,6 +18,7 @@ public: virtual void bind(GLbyte *offset) = 0; protected: + Shader(const char* name_, const char* vertex, const char* fragment, gl::ObjectStore&); GLint a_pos = -1; private: |