From 8d6b9696bf3cea0cf8c3beaf9dfb48c7d376d925 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 10 Sep 2015 14:05:16 +0300
Subject: [PATCH] [shader] Moved 'a_pos' GL attribute to Shader

Avoids duplicated code in all derived classes.
---
 src/mbgl/shader/box_shader.cpp         | 1 -
 src/mbgl/shader/box_shader.hpp         | 1 -
 src/mbgl/shader/circle_shader.cpp      | 1 -
 src/mbgl/shader/circle_shader.hpp      | 3 ---
 src/mbgl/shader/dot_shader.cpp         | 1 -
 src/mbgl/shader/dot_shader.hpp         | 3 ---
 src/mbgl/shader/icon_shader.cpp        | 1 -
 src/mbgl/shader/icon_shader.hpp        | 1 -
 src/mbgl/shader/line_shader.cpp        | 1 -
 src/mbgl/shader/line_shader.hpp        | 1 -
 src/mbgl/shader/linepattern_shader.cpp | 1 -
 src/mbgl/shader/linepattern_shader.hpp | 1 -
 src/mbgl/shader/linesdf_shader.cpp     | 1 -
 src/mbgl/shader/linesdf_shader.hpp     | 1 -
 src/mbgl/shader/outline_shader.cpp     | 1 -
 src/mbgl/shader/outline_shader.hpp     | 3 ---
 src/mbgl/shader/pattern_shader.cpp     | 1 -
 src/mbgl/shader/pattern_shader.hpp     | 3 ---
 src/mbgl/shader/plain_shader.cpp       | 1 -
 src/mbgl/shader/plain_shader.hpp       | 3 ---
 src/mbgl/shader/raster_shader.cpp      | 1 -
 src/mbgl/shader/raster_shader.hpp      | 3 ---
 src/mbgl/shader/sdf_shader.cpp         | 1 -
 src/mbgl/shader/sdf_shader.hpp         | 1 -
 src/mbgl/shader/shader.cpp             | 2 ++
 src/mbgl/shader/shader.hpp             | 7 ++++++-
 26 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/box_shader.cpp
index 2676223a9..5c290718e 100644
--- a/src/mbgl/shader/box_shader.cpp
+++ b/src/mbgl/shader/box_shader.cpp
@@ -12,7 +12,6 @@ CollisionBoxShader::CollisionBoxShader()
         shaders[BOX_SHADER].vertex,
         shaders[BOX_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     a_extrude = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_extrude"));
     a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
 }
diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/box_shader.hpp
index 5c84d8906..832d3e1c0 100644
--- a/src/mbgl/shader/box_shader.hpp
+++ b/src/mbgl/shader/box_shader.hpp
@@ -18,7 +18,6 @@ public:
     Uniform<float>                u_maxzoom        = {"u_maxzoom",        *this};
 
 protected:
-    int32_t a_pos = -1;
     int32_t a_extrude = -1;
     int32_t a_data = -1;
 };
diff --git a/src/mbgl/shader/circle_shader.cpp b/src/mbgl/shader/circle_shader.cpp
index 074f92d68..dc8558d10 100644
--- a/src/mbgl/shader/circle_shader.cpp
+++ b/src/mbgl/shader/circle_shader.cpp
@@ -12,7 +12,6 @@ CircleShader::CircleShader()
         shaders[CIRCLE_SHADER].vertex,
         shaders[CIRCLE_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 void CircleShader::bind(char *offset) {
diff --git a/src/mbgl/shader/circle_shader.hpp b/src/mbgl/shader/circle_shader.hpp
index 545a0baad..ce7bb2d20 100644
--- a/src/mbgl/shader/circle_shader.hpp
+++ b/src/mbgl/shader/circle_shader.hpp
@@ -17,9 +17,6 @@ public:
     Uniform<std::array<float, 4>>  u_color    = {"u_color",    *this};
     Uniform<float>                 u_size     = {"u_size",     *this};
     Uniform<float>                 u_blur     = {"u_blur",     *this};
-
-private:
-    int32_t a_pos = -1;
 };
 
 }
diff --git a/src/mbgl/shader/dot_shader.cpp b/src/mbgl/shader/dot_shader.cpp
index 57a60cc51..67c463944 100644
--- a/src/mbgl/shader/dot_shader.cpp
+++ b/src/mbgl/shader/dot_shader.cpp
@@ -12,7 +12,6 @@ DotShader::DotShader()
          shaders[DOT_SHADER].vertex,
          shaders[DOT_SHADER].fragment
          ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 void DotShader::bind(char *offset) {
diff --git a/src/mbgl/shader/dot_shader.hpp b/src/mbgl/shader/dot_shader.hpp
index 2c4176f36..51263a731 100644
--- a/src/mbgl/shader/dot_shader.hpp
+++ b/src/mbgl/shader/dot_shader.hpp
@@ -16,9 +16,6 @@ public:
     Uniform<std::array<float, 4>> u_color  = {"u_color",  *this};
     Uniform<float>                u_size   = {"u_size",   *this};
     Uniform<float>                u_blur   = {"u_blur",   *this};
-
-private:
-    int32_t a_pos = -1;
 };
 
 }
diff --git a/src/mbgl/shader/icon_shader.cpp b/src/mbgl/shader/icon_shader.cpp
index 0f626ec9e..1084ab308 100644
--- a/src/mbgl/shader/icon_shader.cpp
+++ b/src/mbgl/shader/icon_shader.cpp
@@ -12,7 +12,6 @@ IconShader::IconShader()
          shaders[ICON_SHADER].vertex,
          shaders[ICON_SHADER].fragment
          ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     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"));
diff --git a/src/mbgl/shader/icon_shader.hpp b/src/mbgl/shader/icon_shader.hpp
index 18b0fce37..20d3ebf5c 100644
--- a/src/mbgl/shader/icon_shader.hpp
+++ b/src/mbgl/shader/icon_shader.hpp
@@ -25,7 +25,6 @@ public:
     Uniform<float>                u_extra       = {"u_extra",       *this};
 
 private:
-    int32_t a_pos = -1;
     int32_t a_offset = -1;
     int32_t a_data1 = -1;
     int32_t a_data2 = -1;
diff --git a/src/mbgl/shader/line_shader.cpp b/src/mbgl/shader/line_shader.cpp
index c2364c9be..66dff81c9 100644
--- a/src/mbgl/shader/line_shader.cpp
+++ b/src/mbgl/shader/line_shader.cpp
@@ -12,7 +12,6 @@ LineShader::LineShader()
         shaders[LINE_SHADER].vertex,
         shaders[LINE_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
 }
 
diff --git a/src/mbgl/shader/line_shader.hpp b/src/mbgl/shader/line_shader.hpp
index 0572cac88..1a4289ded 100644
--- a/src/mbgl/shader/line_shader.hpp
+++ b/src/mbgl/shader/line_shader.hpp
@@ -22,7 +22,6 @@ public:
     UniformMatrix<2>               u_antialiasingmatrix  = {"u_antialiasingmatrix",  *this};
 
 private:
-    int32_t a_pos = -1;
     int32_t a_data = -1;
 };
 
diff --git a/src/mbgl/shader/linepattern_shader.cpp b/src/mbgl/shader/linepattern_shader.cpp
index 7bfd1412d..65404cb11 100644
--- a/src/mbgl/shader/linepattern_shader.cpp
+++ b/src/mbgl/shader/linepattern_shader.cpp
@@ -12,7 +12,6 @@ LinepatternShader::LinepatternShader()
          shaders[LINEPATTERN_SHADER].vertex,
          shaders[LINEPATTERN_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
 }
 
diff --git a/src/mbgl/shader/linepattern_shader.hpp b/src/mbgl/shader/linepattern_shader.hpp
index dce065a0d..a06135180 100644
--- a/src/mbgl/shader/linepattern_shader.hpp
+++ b/src/mbgl/shader/linepattern_shader.hpp
@@ -30,7 +30,6 @@ public:
     UniformMatrix<2>               u_antialiasingmatrix  = {"u_antialiasingmatrix",  *this};
 
 private:
-    int32_t a_pos = -1;
     int32_t a_data = -1;
 };
 }
diff --git a/src/mbgl/shader/linesdf_shader.cpp b/src/mbgl/shader/linesdf_shader.cpp
index bd2137de3..a08c99c74 100644
--- a/src/mbgl/shader/linesdf_shader.cpp
+++ b/src/mbgl/shader/linesdf_shader.cpp
@@ -12,7 +12,6 @@ LineSDFShader::LineSDFShader()
         shaders[LINESDF_SHADER].vertex,
         shaders[LINESDF_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     a_data = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_data"));
 }
 
diff --git a/src/mbgl/shader/linesdf_shader.hpp b/src/mbgl/shader/linesdf_shader.hpp
index 9928d5b30..4d08916cd 100644
--- a/src/mbgl/shader/linesdf_shader.hpp
+++ b/src/mbgl/shader/linesdf_shader.hpp
@@ -29,7 +29,6 @@ public:
     UniformMatrix<2>               u_antialiasingmatrix  = {"u_antialiasingmatrix",  *this};
 
 private:
-    int32_t a_pos = -1;
     int32_t a_data = -1;
 };
 
diff --git a/src/mbgl/shader/outline_shader.cpp b/src/mbgl/shader/outline_shader.cpp
index ee2a6bcd4..1d2c3667f 100644
--- a/src/mbgl/shader/outline_shader.cpp
+++ b/src/mbgl/shader/outline_shader.cpp
@@ -12,7 +12,6 @@ OutlineShader::OutlineShader()
         shaders[OUTLINE_SHADER].vertex,
         shaders[OUTLINE_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 void OutlineShader::bind(char *offset) {
diff --git a/src/mbgl/shader/outline_shader.hpp b/src/mbgl/shader/outline_shader.hpp
index f3e8175fd..9b086594b 100644
--- a/src/mbgl/shader/outline_shader.hpp
+++ b/src/mbgl/shader/outline_shader.hpp
@@ -15,9 +15,6 @@ public:
     UniformMatrix<4>              u_matrix = {"u_matrix", *this};
     Uniform<std::array<float, 4>> u_color  = {"u_color",  *this};
     Uniform<std::array<float, 2>> u_world  = {"u_world",  *this};
-
-private:
-    int32_t a_pos = -1;
 };
 
 }
diff --git a/src/mbgl/shader/pattern_shader.cpp b/src/mbgl/shader/pattern_shader.cpp
index 66369d528..b5883b956 100644
--- a/src/mbgl/shader/pattern_shader.cpp
+++ b/src/mbgl/shader/pattern_shader.cpp
@@ -12,7 +12,6 @@ PatternShader::PatternShader()
         shaders[PATTERN_SHADER].vertex,
         shaders[PATTERN_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 void PatternShader::bind(char *offset) {
diff --git a/src/mbgl/shader/pattern_shader.hpp b/src/mbgl/shader/pattern_shader.hpp
index 9fc8dcfa0..5090a453e 100644
--- a/src/mbgl/shader/pattern_shader.hpp
+++ b/src/mbgl/shader/pattern_shader.hpp
@@ -22,9 +22,6 @@ public:
     Uniform<int32_t>              u_image         = {"u_image",         *this};
     UniformMatrix<3>              u_patternmatrix_a = {"u_patternmatrix_a", *this};
     UniformMatrix<3>              u_patternmatrix_b = {"u_patternmatrix_b", *this};
-
-private:
-    int32_t a_pos = -1;
 };
 
 }
diff --git a/src/mbgl/shader/plain_shader.cpp b/src/mbgl/shader/plain_shader.cpp
index 93dbb42a5..bb719f47d 100644
--- a/src/mbgl/shader/plain_shader.cpp
+++ b/src/mbgl/shader/plain_shader.cpp
@@ -12,7 +12,6 @@ PlainShader::PlainShader()
         shaders[PLAIN_SHADER].vertex,
         shaders[PLAIN_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 void PlainShader::bind(char *offset) {
diff --git a/src/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp
index 051501c3c..266600024 100644
--- a/src/mbgl/shader/plain_shader.hpp
+++ b/src/mbgl/shader/plain_shader.hpp
@@ -14,9 +14,6 @@ public:
 
     UniformMatrix<4>              u_matrix   = {"u_matrix", *this};
     Uniform<std::array<float, 4>> u_color    = {"u_color",  *this};
-
-private:
-    int32_t a_pos = -1;
 };
 
 }
diff --git a/src/mbgl/shader/raster_shader.cpp b/src/mbgl/shader/raster_shader.cpp
index 2d6954920..ce03488ac 100644
--- a/src/mbgl/shader/raster_shader.cpp
+++ b/src/mbgl/shader/raster_shader.cpp
@@ -12,7 +12,6 @@ RasterShader::RasterShader()
          shaders[RASTER_SHADER].vertex,
          shaders[RASTER_SHADER].fragment
          ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 void RasterShader::bind(char *offset) {
diff --git a/src/mbgl/shader/raster_shader.hpp b/src/mbgl/shader/raster_shader.hpp
index 8cf97055a..e869fb741 100644
--- a/src/mbgl/shader/raster_shader.hpp
+++ b/src/mbgl/shader/raster_shader.hpp
@@ -21,9 +21,6 @@ public:
     Uniform<float>                u_saturation_factor = {"u_saturation_factor", *this};
     Uniform<float>                u_contrast_factor   = {"u_contrast_factor",   *this};
     Uniform<std::array<float, 3>> u_spin_weights      = {"u_spin_weights",      *this};
-
-private:
-    int32_t a_pos = -1;
 };
 
 }
diff --git a/src/mbgl/shader/sdf_shader.cpp b/src/mbgl/shader/sdf_shader.cpp
index ca1dab58d..7b729a458 100644
--- a/src/mbgl/shader/sdf_shader.cpp
+++ b/src/mbgl/shader/sdf_shader.cpp
@@ -12,7 +12,6 @@ SDFShader::SDFShader()
         shaders[SDF_SHADER].vertex,
         shaders[SDF_SHADER].fragment
     ) {
-    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
     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"));
diff --git a/src/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp
index 181788ab1..f8e0aef2b 100644
--- a/src/mbgl/shader/sdf_shader.hpp
+++ b/src/mbgl/shader/sdf_shader.hpp
@@ -27,7 +27,6 @@ public:
     Uniform<float>                u_extra       = {"u_extra",       *this};
 
 protected:
-    int32_t a_pos = -1;
     int32_t a_offset = -1;
     int32_t a_data1 = -1;
     int32_t a_data2 = -1;
diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp
index 6210c1c32..1e3df1bbc 100644
--- a/src/mbgl/shader/shader.cpp
+++ b/src/mbgl/shader/shader.cpp
@@ -97,6 +97,8 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo
     MBGL_CHECK_ERROR(glDeleteShader(vertShader));
     MBGL_CHECK_ERROR(glDetachShader(program, fragShader));
     MBGL_CHECK_ERROR(glDeleteShader(fragShader));
+
+    a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos"));
 }
 
 
diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp
index b3d9b4e46..2a1cf39fe 100644
--- a/src/mbgl/shader/shader.hpp
+++ b/src/mbgl/shader/shader.hpp
@@ -1,10 +1,12 @@
 #ifndef MBGL_RENDERER_SHADER
 #define MBGL_RENDERER_SHADER
 
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/util/noncopyable.hpp>
+
 #include <cstdint>
 #include <array>
 #include <string>
-#include <mbgl/util/noncopyable.hpp>
 
 namespace mbgl {
 
@@ -19,6 +21,9 @@ public:
         return program;
     }
 
+protected:
+    GLint a_pos = -1;
+
 private:
     bool compileShader(uint32_t *shader, uint32_t type, const char *source);
 };