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/sdf_shader.cpp | |
| 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/sdf_shader.cpp')
| -rw-r--r-- | src/mbgl/shader/sdf_shader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/shader/sdf_shader.cpp b/src/mbgl/shader/sdf_shader.cpp index e613863041..a972849d3d 100644 --- a/src/mbgl/shader/sdf_shader.cpp +++ b/src/mbgl/shader/sdf_shader.cpp @@ -7,7 +7,8 @@ using namespace mbgl; -SDFShader::SDFShader() : Shader("sdf", shaders::sdf::vertex, shaders::sdf::fragment) { +SDFShader::SDFShader(gl::GLObjectStore& glObjectStore) + : Shader("sdf", shaders::sdf::vertex, shaders::sdf::fragment, glObjectStore) { a_offset = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_offset")); a_data1 = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_data1")); a_data2 = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_data2")); |