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_debug.cpp | |
parent | 36210fe4e9c68a52dedc90548d90e77cf39a2228 (diff) | |
download | qtlocation-mapboxgl-66bdbc3b969083b9d647abdf72784be64a125949.tar.gz |
[core] Introduce gl::Program template
Diffstat (limited to 'src/mbgl/renderer/painter_debug.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_debug.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp index 08877949f6..a0fc98b8c1 100644 --- a/src/mbgl/renderer/painter_debug.cpp +++ b/src/mbgl/renderer/painter_debug.cpp @@ -4,8 +4,8 @@ #include <mbgl/renderer/paint_parameters.hpp> #include <mbgl/map/view.hpp> #include <mbgl/tile/tile.hpp> -#include <mbgl/shader/shaders.hpp> -#include <mbgl/shader/fill_uniforms.hpp> +#include <mbgl/programs/programs.hpp> +#include <mbgl/programs/fill_program.hpp> #include <mbgl/util/string.hpp> #include <mbgl/gl/debugging.hpp> #include <mbgl/util/color.hpp> @@ -23,8 +23,8 @@ void Painter::renderTileDebug(const RenderTile& renderTile) { gl::DepthMode::disabled(), stencilModeForClipping(renderTile.clip), gl::ColorMode::unblended(), - shaders->fill, - FillColorUniforms::Values { + programs->fill, + FillProgram::UniformValues { uniforms::u_matrix::Value{ renderTile.matrix }, uniforms::u_opacity::Value{ 1.0f }, uniforms::u_color::Value{ color }, |