summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/shader/box_shader.cpp9
-rw-r--r--src/mbgl/shader/circle_shader.cpp11
-rw-r--r--src/mbgl/shader/dot_shader.cpp12
-rw-r--r--src/mbgl/shader/icon_shader.cpp12
-rw-r--r--src/mbgl/shader/line_shader.cpp12
-rw-r--r--src/mbgl/shader/linepattern_shader.cpp11
-rw-r--r--src/mbgl/shader/linesdf_shader.cpp11
-rw-r--r--src/mbgl/shader/outline_shader.cpp11
-rw-r--r--src/mbgl/shader/pattern_shader.cpp6
-rw-r--r--src/mbgl/shader/plain_shader.cpp12
-rw-r--r--src/mbgl/shader/raster_shader.cpp11
-rw-r--r--src/mbgl/shader/sdf_shader.cpp14
12 files changed, 47 insertions, 85 deletions
diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/box_shader.cpp
index beb5e15f9e..d9845ec36f 100644
--- a/src/mbgl/shader/box_shader.cpp
+++ b/src/mbgl/shader/box_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/box_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/box.vertex.hpp>
+#include <mbgl/shader/box.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -7,11 +8,7 @@
using namespace mbgl;
CollisionBoxShader::CollisionBoxShader()
- : Shader(
- "collisionbox",
- shaders[BOX_SHADER].vertex,
- shaders[BOX_SHADER].fragment
- ) {
+ : 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"));
}
diff --git a/src/mbgl/shader/circle_shader.cpp b/src/mbgl/shader/circle_shader.cpp
index 8fa10191b9..0af5bcf604 100644
--- a/src/mbgl/shader/circle_shader.cpp
+++ b/src/mbgl/shader/circle_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/circle_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/circle.vertex.hpp>
+#include <mbgl/shader/circle.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -7,14 +8,10 @@
using namespace mbgl;
CircleShader::CircleShader()
- : Shader(
- "circle",
- shaders[CIRCLE_SHADER].vertex,
- shaders[CIRCLE_SHADER].fragment
- ) {
+ : Shader("circle", shaders::circle::vertex, shaders::circle::fragment) {
}
-void CircleShader::bind(GLbyte *offset) {
+void CircleShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 4, offset));
}
diff --git a/src/mbgl/shader/dot_shader.cpp b/src/mbgl/shader/dot_shader.cpp
index baec3678b4..2eba489b66 100644
--- a/src/mbgl/shader/dot_shader.cpp
+++ b/src/mbgl/shader/dot_shader.cpp
@@ -1,20 +1,16 @@
#include <mbgl/shader/dot_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/dot.vertex.hpp>
+#include <mbgl/shader/dot.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
using namespace mbgl;
-DotShader::DotShader()
-: Shader(
- "dot",
- shaders[DOT_SHADER].vertex,
- shaders[DOT_SHADER].fragment
- ) {
+DotShader::DotShader() : Shader("dot", shaders::dot::vertex, shaders::dot::fragment) {
}
-void DotShader::bind(GLbyte *offset) {
+void DotShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 8, offset));
}
diff --git a/src/mbgl/shader/icon_shader.cpp b/src/mbgl/shader/icon_shader.cpp
index a9b4be23e8..bb43cb3e4a 100644
--- a/src/mbgl/shader/icon_shader.cpp
+++ b/src/mbgl/shader/icon_shader.cpp
@@ -1,23 +1,19 @@
#include <mbgl/shader/icon_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/icon.vertex.hpp>
+#include <mbgl/shader/icon.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
using namespace mbgl;
-IconShader::IconShader()
- : Shader(
- "icon",
- shaders[ICON_SHADER].vertex,
- shaders[ICON_SHADER].fragment
- ) {
+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"));
}
-void IconShader::bind(GLbyte *offset) {
+void IconShader::bind(GLbyte* offset) {
const GLsizei stride = 16;
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
diff --git a/src/mbgl/shader/line_shader.cpp b/src/mbgl/shader/line_shader.cpp
index 1e2306939d..54bc6c1148 100644
--- a/src/mbgl/shader/line_shader.cpp
+++ b/src/mbgl/shader/line_shader.cpp
@@ -1,21 +1,17 @@
#include <mbgl/shader/line_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/line.vertex.hpp>
+#include <mbgl/shader/line.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
using namespace mbgl;
-LineShader::LineShader()
- : Shader(
- "line",
- shaders[LINE_SHADER].vertex,
- shaders[LINE_SHADER].fragment
- ) {
+LineShader::LineShader() : Shader("line", shaders::line::vertex, shaders::line::fragment) {
a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
}
-void LineShader::bind(GLbyte *offset) {
+void LineShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 8, offset + 0));
diff --git a/src/mbgl/shader/linepattern_shader.cpp b/src/mbgl/shader/linepattern_shader.cpp
index 4d416d506e..9e71d0a9d9 100644
--- a/src/mbgl/shader/linepattern_shader.cpp
+++ b/src/mbgl/shader/linepattern_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/linepattern_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/linepattern.vertex.hpp>
+#include <mbgl/shader/linepattern.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -7,15 +8,11 @@
using namespace mbgl;
LinepatternShader::LinepatternShader()
- : Shader(
- "linepattern",
- shaders[LINEPATTERN_SHADER].vertex,
- shaders[LINEPATTERN_SHADER].fragment
- ) {
+ : Shader("linepattern", shaders::linepattern::vertex, shaders::linepattern::fragment) {
a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
}
-void LinepatternShader::bind(GLbyte *offset) {
+void LinepatternShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 8, offset + 0));
diff --git a/src/mbgl/shader/linesdf_shader.cpp b/src/mbgl/shader/linesdf_shader.cpp
index 1a56bb106e..df988bb337 100644
--- a/src/mbgl/shader/linesdf_shader.cpp
+++ b/src/mbgl/shader/linesdf_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/linesdf_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/linesdf.vertex.hpp>
+#include <mbgl/shader/linesdf.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -7,15 +8,11 @@
using namespace mbgl;
LineSDFShader::LineSDFShader()
- : Shader(
- "line",
- shaders[LINESDF_SHADER].vertex,
- shaders[LINESDF_SHADER].fragment
- ) {
+ : Shader("line", shaders::linesdf::vertex, shaders::linesdf::fragment) {
a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
}
-void LineSDFShader::bind(GLbyte *offset) {
+void LineSDFShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 8, offset + 0));
diff --git a/src/mbgl/shader/outline_shader.cpp b/src/mbgl/shader/outline_shader.cpp
index 74453468bf..9cda1a1108 100644
--- a/src/mbgl/shader/outline_shader.cpp
+++ b/src/mbgl/shader/outline_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/outline_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/outline.vertex.hpp>
+#include <mbgl/shader/outline.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -7,14 +8,10 @@
using namespace mbgl;
OutlineShader::OutlineShader()
- : Shader(
- "outline",
- shaders[OUTLINE_SHADER].vertex,
- shaders[OUTLINE_SHADER].fragment
- ) {
+ : Shader("outline", shaders::outline::vertex, shaders::outline::fragment) {
}
-void OutlineShader::bind(GLbyte *offset) {
+void OutlineShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 0, offset));
}
diff --git a/src/mbgl/shader/pattern_shader.cpp b/src/mbgl/shader/pattern_shader.cpp
index d6ddab8e2e..ef3f35c356 100644
--- a/src/mbgl/shader/pattern_shader.cpp
+++ b/src/mbgl/shader/pattern_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/pattern_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/pattern.vertex.hpp>
+#include <mbgl/shader/pattern.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -9,8 +10,7 @@ using namespace mbgl;
PatternShader::PatternShader()
: Shader(
"pattern",
- shaders[PATTERN_SHADER].vertex,
- shaders[PATTERN_SHADER].fragment
+ shaders::pattern::vertex, shaders::pattern::fragment
) {
}
diff --git a/src/mbgl/shader/plain_shader.cpp b/src/mbgl/shader/plain_shader.cpp
index 52fef07c05..1817ffbc3d 100644
--- a/src/mbgl/shader/plain_shader.cpp
+++ b/src/mbgl/shader/plain_shader.cpp
@@ -1,20 +1,16 @@
#include <mbgl/shader/plain_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/plain.vertex.hpp>
+#include <mbgl/shader/plain.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
using namespace mbgl;
-PlainShader::PlainShader()
- : Shader(
- "plain",
- shaders[PLAIN_SHADER].vertex,
- shaders[PLAIN_SHADER].fragment
- ) {
+PlainShader::PlainShader() : Shader("plain", shaders::plain::vertex, shaders::plain::fragment) {
}
-void PlainShader::bind(GLbyte *offset) {
+void PlainShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 0, offset));
}
diff --git a/src/mbgl/shader/raster_shader.cpp b/src/mbgl/shader/raster_shader.cpp
index b8496230b9..aaf0bfd2a5 100644
--- a/src/mbgl/shader/raster_shader.cpp
+++ b/src/mbgl/shader/raster_shader.cpp
@@ -1,5 +1,6 @@
#include <mbgl/shader/raster_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/raster.vertex.hpp>
+#include <mbgl/shader/raster.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
@@ -7,14 +8,10 @@
using namespace mbgl;
RasterShader::RasterShader()
- : Shader(
- "raster",
- shaders[RASTER_SHADER].vertex,
- shaders[RASTER_SHADER].fragment
- ) {
+ : Shader("raster", shaders::raster::vertex, shaders::raster::fragment) {
}
-void RasterShader::bind(GLbyte *offset) {
+void RasterShader::bind(GLbyte* offset) {
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 0, offset));
}
diff --git a/src/mbgl/shader/sdf_shader.cpp b/src/mbgl/shader/sdf_shader.cpp
index 144ba6c475..97297a7baf 100644
--- a/src/mbgl/shader/sdf_shader.cpp
+++ b/src/mbgl/shader/sdf_shader.cpp
@@ -1,23 +1,19 @@
#include <mbgl/shader/sdf_shader.hpp>
-#include <mbgl/shader/shaders.hpp>
+#include <mbgl/shader/sdf.vertex.hpp>
+#include <mbgl/shader/sdf.fragment.hpp>
#include <mbgl/platform/gl.hpp>
#include <cstdio>
using namespace mbgl;
-SDFShader::SDFShader()
- : Shader(
- "sdf",
- shaders[SDF_SHADER].vertex,
- shaders[SDF_SHADER].fragment
- ) {
+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"));
}
-void SDFGlyphShader::bind(GLbyte *offset) {
+void SDFGlyphShader::bind(GLbyte* offset) {
const int stride = 16;
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
@@ -33,7 +29,7 @@ void SDFGlyphShader::bind(GLbyte *offset) {
MBGL_CHECK_ERROR(glVertexAttribPointer(a_data2, 4, GL_UNSIGNED_BYTE, false, stride, offset + 12));
}
-void SDFIconShader::bind(GLbyte *offset) {
+void SDFIconShader::bind(GLbyte* offset) {
const int stride = 16;
MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
View Lorry Controller Status