diff options
Diffstat (limited to 'src/mbgl/programs/fill_extrusion_program.cpp')
| -rw-r--r-- | src/mbgl/programs/fill_extrusion_program.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp index fb9c9f7b4a..7688d09299 100644 --- a/src/mbgl/programs/fill_extrusion_program.cpp +++ b/src/mbgl/programs/fill_extrusion_program.cpp @@ -1,4 +1,5 @@ #include <mbgl/programs/fill_extrusion_program.hpp> +#include <mbgl/gfx/context_impl.hpp> #include <mbgl/renderer/image_atlas.hpp> #include <mbgl/renderer/cross_faded_property_evaluator.hpp> #include <mbgl/tile/tile_id.hpp> @@ -7,6 +8,9 @@ namespace mbgl { +template std::unique_ptr<gfx::Program<FillExtrusionProgram>> gfx::Context::createProgram(const ProgramParameters&); +template std::unique_ptr<gfx::Program<FillExtrusionPatternProgram>> gfx::Context::createProgram(const ProgramParameters&); + using namespace style; static_assert(sizeof(FillExtrusionLayoutVertex) == 12, "expected FillExtrusionLayoutVertex size"); @@ -31,10 +35,8 @@ float lightIntensity(const EvaluatedLight& light) { return light.get<LightIntensity>(); } -FillExtrusionProgram::UniformValues -FillExtrusionProgram::uniformValues(mat4 matrix, - const TransformState& state, - const EvaluatedLight& light) { +FillExtrusionProgram::LayoutUniformValues FillExtrusionProgram::layoutUniformValues( + mat4 matrix, const TransformState& state, const EvaluatedLight& light) { return { uniforms::u_matrix::Value( matrix ), uniforms::u_lightcolor::Value( lightColor(light) ), @@ -43,8 +45,8 @@ FillExtrusionProgram::uniformValues(mat4 matrix, }; } -FillExtrusionPatternProgram::UniformValues -FillExtrusionPatternProgram::uniformValues(mat4 matrix, +FillExtrusionPatternProgram::LayoutUniformValues +FillExtrusionPatternProgram::layoutUniformValues(mat4 matrix, Size atlasSize, const CrossfadeParameters& crossfade, const UnwrappedTileID& tileID, |