summaryrefslogtreecommitdiff
path: root/src/mbgl/shader/box_shader.hpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-09-10 14:46:38 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-09-14 11:29:49 +0300
commit2156aa35ca96f9dd05166fd6b012f09eaaa5b934 (patch)
treebad8f28c5cc29c81761c11eceed4bd2258af2375 /src/mbgl/shader/box_shader.hpp
parent8d6b9696bf3cea0cf8c3beaf9dfb48c7d376d925 (diff)
downloadqtlocation-mapboxgl-2156aa35ca96f9dd05166fd6b012f09eaaa5b934.tar.gz
[shader] bind() is now a pure virtual
- Shader::bind() now receives a GLbyte* - BUFFER_OFFSET now uses GLbyte
Diffstat (limited to 'src/mbgl/shader/box_shader.hpp')
-rw-r--r--src/mbgl/shader/box_shader.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/box_shader.hpp
index 832d3e1c03..20d1deec62 100644
--- a/src/mbgl/shader/box_shader.hpp
+++ b/src/mbgl/shader/box_shader.hpp
@@ -3,6 +3,7 @@
#include <mbgl/shader/shader.hpp>
#include <mbgl/shader/uniform.hpp>
+#include <mbgl/platform/gl.hpp>
namespace mbgl {
@@ -10,7 +11,7 @@ class CollisionBoxShader : public Shader {
public:
CollisionBoxShader();
- void bind(char *offset);
+ void bind(GLbyte *offset) final;
UniformMatrix<4> u_matrix = {"u_matrix", *this};
Uniform<float> u_scale = {"u_scale", *this};