diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-28 16:19:33 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
| commit | da6e1390c68e01e02652104586c759d46e04c7fd (patch) | |
| tree | 002942c69e886a2ad86ac7bea8272d36a16c28e2 /src/mbgl/programs | |
| parent | fd37d9065029c732d97e6fa59bc0a0d27ecd3c72 (diff) | |
| download | qtlocation-mapboxgl-da6e1390c68e01e02652104586c759d46e04c7fd.tar.gz | |
[core] move ColorMode to gfx namespace
Diffstat (limited to 'src/mbgl/programs')
| -rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/programs/program.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 1adfadf794..98f4f9320c 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -60,7 +60,7 @@ public: DrawMode drawMode, gl::DepthMode depthMode, gl::StencilMode stencilMode, - gl::ColorMode colorMode, + gfx::ColorMode colorMode, gl::CullFaceMode cullFaceMode, const UniformValues& uniformValues, const gl::VertexBuffer<gfx::Vertex<CollisionBoxLayoutAttributes>>& layoutVertexBuffer, @@ -141,7 +141,7 @@ public: DrawMode drawMode, gl::DepthMode depthMode, gl::StencilMode stencilMode, - gl::ColorMode colorMode, + gfx::ColorMode colorMode, gl::CullFaceMode cullFaceMode, const UniformValues& uniformValues, const gl::VertexBuffer<gfx::Vertex<CollisionBoxLayoutAttributes>>& layoutVertexBuffer, diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp index 429937dd7d..0f70c25ded 100644 --- a/src/mbgl/programs/program.hpp +++ b/src/mbgl/programs/program.hpp @@ -73,7 +73,7 @@ public: DrawMode drawMode, gl::DepthMode depthMode, gl::StencilMode stencilMode, - gl::ColorMode colorMode, + gfx::ColorMode colorMode, gl::CullFaceMode cullFaceMode, const gl::IndexBuffer<DrawMode>& indexBuffer, const SegmentVector<Attributes>& segments, diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index ebe40f15b4..64157b6baf 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -308,7 +308,7 @@ public: DrawMode drawMode, gl::DepthMode depthMode, gl::StencilMode stencilMode, - gl::ColorMode colorMode, + gfx::ColorMode colorMode, gl::CullFaceMode cullFaceMode, const gl::IndexBuffer<DrawMode>& indexBuffer, const SegmentVector<Attributes>& segments, |