diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-18 12:03:47 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-20 13:24:20 +0300 |
commit | 7e549b90202655ca0de9f503178f42012c534dbc (patch) | |
tree | 8bb7ca4c4bb1a975082892c4b46d047e6462df28 /src/mbgl/gl | |
parent | 9038d66af60bca616d0f34cda593409daa06271c (diff) | |
download | qtlocation-mapboxgl-7e549b90202655ca0de9f503178f42012c534dbc.tar.gz |
[core] Added BlendColor GL config value
Diffstat (limited to 'src/mbgl/gl')
-rw-r--r-- | src/mbgl/gl/gl_config.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/gl/gl_config.hpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mbgl/gl/gl_config.cpp b/src/mbgl/gl/gl_config.cpp index c3c6601e43..97d2f26f6c 100644 --- a/src/mbgl/gl/gl_config.cpp +++ b/src/mbgl/gl/gl_config.cpp @@ -13,6 +13,7 @@ const DepthTest::Type DepthTest::Default = GL_FALSE; const DepthFunc::Type DepthFunc::Default = GL_LEQUAL; const Blend::Type Blend::Default = GL_TRUE; const BlendFunc::Type BlendFunc::Default = { GL_ONE, GL_ONE_MINUS_SRC_ALPHA }; +const BlendColor::Type BlendColor::Default = { 0, 0, 0, 0 }; const ColorMask::Type ColorMask::Default = { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE }; const ClearDepth::Type ClearDepth::Default = 1; const ClearColor::Type ClearColor::Default = { 0, 0, 0, 0 }; diff --git a/src/mbgl/gl/gl_config.hpp b/src/mbgl/gl/gl_config.hpp index 66f4406530..09080ca365 100644 --- a/src/mbgl/gl/gl_config.hpp +++ b/src/mbgl/gl/gl_config.hpp @@ -56,6 +56,7 @@ public: depthFunc.reset(); blend.reset(); blendFunc.reset(); + blendColor.reset(); colorMask.reset(); clearDepth.reset(); clearColor.reset(); @@ -80,6 +81,7 @@ public: depthFunc.setDirty(); blend.setDirty(); blendFunc.setDirty(); + blendColor.setDirty(); colorMask.setDirty(); clearDepth.setDirty(); clearColor.setDirty(); @@ -103,6 +105,7 @@ public: Value<DepthFunc> depthFunc; Value<Blend> blend; Value<BlendFunc> blendFunc; + Value<BlendColor> blendColor; Value<ColorMask> colorMask; Value<ClearDepth> clearDepth; Value<ClearColor> clearColor; |