diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-02-18 11:19:24 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-02-18 15:15:24 -0800 |
| commit | 9c26f063187b129218910dbb86eb21215a2cdf40 (patch) | |
| tree | 189f84f90cef341a0a084fefde40f4f07da117cb /src/mbgl/shader/box_shader.hpp | |
| parent | 7b39ce95210ceb6640b3a3399dacd1d0e826ac1f (diff) | |
| download | qtlocation-mapboxgl-9c26f063187b129218910dbb86eb21215a2cdf40.tar.gz | |
[core] Thread GLObjectStore through to Holder objects
This eliminates the reliance on ThreadContext to provide GLObjectStore, and statically enforces that GL cleanup functions happen only when GLObjectStore::performCleanup is called.
With the elimination of the Map thread, this becomes important because there may be multiple GLObjectStore's per-thread, and Map will need to ensure that the correct context is active when calling GLObjectStore::performCleanup.
Diffstat (limited to 'src/mbgl/shader/box_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/box_shader.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/box_shader.hpp index bc781dbc15..f3015b73a7 100644 --- a/src/mbgl/shader/box_shader.hpp +++ b/src/mbgl/shader/box_shader.hpp @@ -9,7 +9,7 @@ namespace mbgl { class CollisionBoxShader : public Shader { public: - CollisionBoxShader(); + CollisionBoxShader(gl::GLObjectStore&); void bind(GLbyte *offset) final; |