[core] Added PixelZoom, RasterPos to GL config

This commit is contained in:
Bruno de Oliveira Abinader
2016-05-24 17:30:54 +03:00
parent 9732f02422
commit 876bf0687a
3 changed files with 21 additions and 0 deletions

View File

@@ -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;

View File

@@ -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

View File

@@ -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