diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 18:17:33 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-08 08:09:29 -0800 |
| commit | 66bdbc3b969083b9d647abdf72784be64a125949 (patch) | |
| tree | 9f2f1c6eb3d0569926420459c2c9afda50c66fd0 /src/mbgl/renderer/painter_circle.cpp | |
| parent | 36210fe4e9c68a52dedc90548d90e77cf39a2228 (diff) | |
| download | qtlocation-mapboxgl-66bdbc3b969083b9d647abdf72784be64a125949.tar.gz | |
[core] Introduce gl::Program template
Diffstat (limited to 'src/mbgl/renderer/painter_circle.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter_circle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp index fedd1985ba..e4977b8abb 100644 --- a/src/mbgl/renderer/painter_circle.cpp +++ b/src/mbgl/renderer/painter_circle.cpp @@ -4,8 +4,8 @@ #include <mbgl/renderer/render_tile.hpp> #include <mbgl/style/layers/circle_layer.hpp> #include <mbgl/style/layers/circle_layer_impl.hpp> -#include <mbgl/shader/shaders.hpp> -#include <mbgl/shader/circle_uniforms.hpp> +#include <mbgl/programs/programs.hpp> +#include <mbgl/programs/circle_program.hpp> #include <mbgl/gl/context.hpp> namespace mbgl { @@ -29,8 +29,8 @@ void Painter::renderCircle(PaintParameters& parameters, ? stencilModeForClipping(tile.clip) : gl::StencilMode::disabled(), colorModeForRenderPass(), - parameters.shaders.circle, - CircleUniforms::Values { + parameters.programs.circle, + CircleProgram::UniformValues { uniforms::u_matrix::Value{ tile.translatedMatrix(properties.circleTranslate.value, properties.circleTranslateAnchor.value, state) }, |