summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-05-24 17:30:54 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-05-24 19:58:24 +0300
commit876bf0687a6e2b6b5dd491b65dad587c688aa56d (patch)
tree6f51fed2150789d124baa70c3c461337bca00965
parent9732f02422eb5cd5852d47e888b061aaf6ffe0bd (diff)
downloadqtlocation-mapboxgl-876bf0687a6e2b6b5dd491b65dad587c688aa56d.tar.gz
[core] Added PixelZoom, RasterPos to GL config
-rw-r--r--include/mbgl/gl/gl_values.hpp4
-rw-r--r--src/mbgl/gl/gl_config.cpp5
-rw-r--r--src/mbgl/gl/gl_config.hpp12
3 files changed, 21 insertions, 0 deletions
diff --git a/include/mbgl/gl/gl_values.hpp b/include/mbgl/gl/gl_values.hpp
index 2ebfe2e687..b96cfe310e 100644
--- a/include/mbgl/gl/gl_values.hpp
+++ b/include/mbgl/gl/gl_values.hpp
@@ -269,6 +269,10 @@ struct PixelZoom {
}
};
+inline bool operator!=(const PixelZoom::Type& a, const PixelZoom::Type& b) {
+ return a.xfactor != b.xfactor || a.yfactor != b.yfactor;
+}
+
struct RasterPos {
using Type = std::array<GLdouble, 4>;
static const Type Default;
diff --git a/src/mbgl/gl/gl_config.cpp b/src/mbgl/gl/gl_config.cpp
index ecf987876c..c3c6601e43 100644
--- a/src/mbgl/gl/gl_config.cpp
+++ b/src/mbgl/gl/gl_config.cpp
@@ -21,5 +21,10 @@ const Program::Type Program::Default = 0;
const LineWidth::Type LineWidth::Default = 1;
const ActiveTexture::Type ActiveTexture::Default = GL_TEXTURE0;
+#ifndef GL_ES_VERSION_2_0
+const PixelZoom::Type PixelZoom::Default = { 1, 1 };
+const RasterPos::Type RasterPos::Default = {{ 0, 0, 0, 0 }};
+#endif // GL_ES_VERSION_2_0
+
} // namespace gl
} // namespace mbgl
diff --git a/src/mbgl/gl/gl_config.hpp b/src/mbgl/gl/gl_config.hpp
index 8ec191daf7..62dfbcadc0 100644
--- a/src/mbgl/gl/gl_config.hpp
+++ b/src/mbgl/gl/gl_config.hpp
@@ -56,6 +56,10 @@ public:
program.reset();
lineWidth.reset();
activeTexture.reset();
+#ifndef GL_ES_VERSION_2_0
+ pixelZoom.reset();
+ rasterPos.reset();
+#endif // GL_ES_VERSION_2_0
}
void setDirty() {
@@ -76,6 +80,10 @@ public:
program.setDirty();
lineWidth.setDirty();
activeTexture.setDirty();
+#ifndef GL_ES_VERSION_2_0
+ pixelZoom.setDirty();
+ rasterPos.setDirty();
+#endif // GL_ES_VERSION_2_0
}
Value<StencilFunc> stencilFunc;
@@ -95,6 +103,10 @@ public:
Value<Program> program;
Value<LineWidth> lineWidth;
Value<ActiveTexture> activeTexture;
+#ifndef GL_ES_VERSION_2_0
+ Value<PixelZoom> pixelZoom;
+ Value<RasterPos> rasterPos;
+#endif // GL_ES_VERSION_2_0
};
} // namespace gl