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_raster.cpp | |
| parent | 36210fe4e9c68a52dedc90548d90e77cf39a2228 (diff) | |
| download | qtlocation-mapboxgl-66bdbc3b969083b9d647abdf72784be64a125949.tar.gz | |
[core] Introduce gl::Program template
Diffstat (limited to 'src/mbgl/renderer/painter_raster.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter_raster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp index 6acd29eb37..c619cad2aa 100644 --- a/src/mbgl/renderer/painter_raster.cpp +++ b/src/mbgl/renderer/painter_raster.cpp @@ -4,8 +4,8 @@ #include <mbgl/renderer/raster_bucket.hpp> #include <mbgl/style/layers/raster_layer.hpp> #include <mbgl/style/layers/raster_layer_impl.hpp> -#include <mbgl/shader/shaders.hpp> -#include <mbgl/shader/raster_uniforms.hpp> +#include <mbgl/programs/programs.hpp> +#include <mbgl/programs/raster_program.hpp> namespace mbgl { @@ -58,8 +58,8 @@ void Painter::renderRaster(PaintParameters& parameters, depthModeForSublayer(0, gl::DepthMode::ReadOnly), gl::StencilMode::disabled(), colorModeForRenderPass(), - parameters.shaders.raster, - RasterUniforms::Values { + parameters.programs.raster, + RasterProgram::UniformValues { uniforms::u_matrix::Value{ tile.matrix }, uniforms::u_image0::Value{ 0 }, uniforms::u_image1::Value{ 1 }, |