diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-27 17:52:14 +0200 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-27 11:03:29 -0700 |
| commit | 44c7e9d05edbe6fee9e8f98b91380b6c07e57ac7 (patch) | |
| tree | cb2ee7fed51efe737543bb6f2444fac885571c41 /src/mbgl/shader/shader.hpp | |
| parent | ce42d22984d19fa020e6fba77e2585c0fd9dacf4 (diff) | |
| download | qtlocation-mapboxgl-44c7e9d05edbe6fee9e8f98b91380b6c07e57ac7.tar.gz | |
[core] merge gl::ObjectStore into gl::Context
Diffstat (limited to 'src/mbgl/shader/shader.hpp')
| -rw-r--r-- | src/mbgl/shader/shader.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp index 620e8f1368..b04c88548d 100644 --- a/src/mbgl/shader/shader.hpp +++ b/src/mbgl/shader/shader.hpp @@ -1,12 +1,16 @@ #pragma once #include <mbgl/gl/gl.hpp> -#include <mbgl/gl/object_store.hpp> +#include <mbgl/gl/object.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/optional.hpp> namespace mbgl { +namespace gl { +class Context; +} // namespace gl + class Shader : private util::noncopyable { public: ~Shader(); @@ -27,7 +31,7 @@ protected: Shader(const char* name_, const char* vertex, const char* fragment, - gl::ObjectStore&, + gl::Context&, Defines defines = Defines::None); static constexpr GLint a_pos = 0; |