diff options
Diffstat (limited to 'src/mbgl/shader')
-rw-r--r-- | src/mbgl/shader/box_shader.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/shader/icon_shader.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/shader/line_shader.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/shader/linepattern_shader.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/shader/linesdf_shader.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/shader/sdf_shader.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/shader/uniform.hpp | 6 |
7 files changed, 15 insertions, 13 deletions
diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/box_shader.cpp index c9cd9bf091..59fd104f83 100644 --- a/src/mbgl/shader/box_shader.cpp +++ b/src/mbgl/shader/box_shader.cpp @@ -9,8 +9,8 @@ using namespace mbgl; CollisionBoxShader::CollisionBoxShader() : Shader("collisionbox", shaders::box::vertex, shaders::box::fragment) { - a_extrude = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_extrude")); - a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data")); + a_extrude = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_extrude")); + a_data = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_data")); } void CollisionBoxShader::bind(GLbyte *offset) { diff --git a/src/mbgl/shader/icon_shader.cpp b/src/mbgl/shader/icon_shader.cpp index 28d84853de..609f2bb293 100644 --- a/src/mbgl/shader/icon_shader.cpp +++ b/src/mbgl/shader/icon_shader.cpp @@ -8,9 +8,9 @@ using namespace mbgl; IconShader::IconShader() : Shader("icon", shaders::icon::vertex, shaders::icon::fragment) { - a_offset = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_offset")); - a_data1 = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data1")); - a_data2 = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data2")); + 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")); } void IconShader::bind(GLbyte* offset) { diff --git a/src/mbgl/shader/line_shader.cpp b/src/mbgl/shader/line_shader.cpp index 12790de00a..e0dc5384b5 100644 --- a/src/mbgl/shader/line_shader.cpp +++ b/src/mbgl/shader/line_shader.cpp @@ -8,7 +8,7 @@ using namespace mbgl; LineShader::LineShader() : Shader("line", shaders::line::vertex, shaders::line::fragment) { - a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data")); + a_data = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_data")); } void LineShader::bind(GLbyte* offset) { diff --git a/src/mbgl/shader/linepattern_shader.cpp b/src/mbgl/shader/linepattern_shader.cpp index 18ec2c23f5..4c15d8b075 100644 --- a/src/mbgl/shader/linepattern_shader.cpp +++ b/src/mbgl/shader/linepattern_shader.cpp @@ -9,7 +9,7 @@ using namespace mbgl; LinepatternShader::LinepatternShader() : Shader("linepattern", shaders::linepattern::vertex, shaders::linepattern::fragment) { - a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data")); + a_data = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_data")); } void LinepatternShader::bind(GLbyte* offset) { diff --git a/src/mbgl/shader/linesdf_shader.cpp b/src/mbgl/shader/linesdf_shader.cpp index 48622cb763..f5eba0a046 100644 --- a/src/mbgl/shader/linesdf_shader.cpp +++ b/src/mbgl/shader/linesdf_shader.cpp @@ -9,7 +9,7 @@ using namespace mbgl; LineSDFShader::LineSDFShader() : Shader("line", shaders::linesdf::vertex, shaders::linesdf::fragment) { - a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data")); + a_data = MBGL_CHECK_ERROR(glGetAttribLocation(getID(), "a_data")); } void LineSDFShader::bind(GLbyte* offset) { diff --git a/src/mbgl/shader/sdf_shader.cpp b/src/mbgl/shader/sdf_shader.cpp index 7ca3bf84de..e613863041 100644 --- a/src/mbgl/shader/sdf_shader.cpp +++ b/src/mbgl/shader/sdf_shader.cpp @@ -8,9 +8,9 @@ using namespace mbgl; SDFShader::SDFShader() : Shader("sdf", shaders::sdf::vertex, shaders::sdf::fragment) { - a_offset = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_offset")); - a_data1 = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data1")); - a_data2 = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data2")); + 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")); } void SDFGlyphShader::bind(GLbyte* offset) { diff --git a/src/mbgl/shader/uniform.hpp b/src/mbgl/shader/uniform.hpp index ceeb22bd99..5c4a2b14c4 100644 --- a/src/mbgl/shader/uniform.hpp +++ b/src/mbgl/shader/uniform.hpp @@ -4,13 +4,15 @@ #include <mbgl/shader/shader.hpp> #include <mbgl/gl/gl.hpp> +#include <array> + namespace mbgl { template <typename T> class Uniform { public: Uniform(const GLchar* name, const Shader& shader) : current() { - location = MBGL_CHECK_ERROR(glGetUniformLocation(shader.program, name)); + location = MBGL_CHECK_ERROR(glGetUniformLocation(shader.getID(), name)); } void operator=(const T& t) { @@ -33,7 +35,7 @@ public: typedef std::array<float, C*R> T; UniformMatrix(const GLchar* name, const Shader& shader) : current() { - location = MBGL_CHECK_ERROR(glGetUniformLocation(shader.program, name)); + location = MBGL_CHECK_ERROR(glGetUniformLocation(shader.getID(), name)); } void operator=(const std::array<double, C*R>& t) { |