summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/fill_extrusion_program.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/fill_extrusion_program.cpp')
-rw-r--r--src/mbgl/programs/fill_extrusion_program.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp
index d301f32707..09da6931b6 100644
--- a/src/mbgl/programs/fill_extrusion_program.cpp
+++ b/src/mbgl/programs/fill_extrusion_program.cpp
@@ -36,9 +36,10 @@ float lightIntensity(const EvaluatedLight& light) {
}
FillExtrusionProgram::LayoutUniformValues FillExtrusionProgram::layoutUniformValues(
- mat4 matrix, const TransformState& state, const EvaluatedLight& light) {
+ mat4 matrix, const TransformState& state, const float opacity, const EvaluatedLight& light) {
return {
uniforms::matrix::Value( matrix ),
+ uniforms::opacity::Value( opacity ),
uniforms::lightcolor::Value( lightColor(light) ),
uniforms::lightpos::Value( lightPosition(light, state) ),
uniforms::lightintensity::Value( lightIntensity(light) )
@@ -51,6 +52,7 @@ FillExtrusionPatternProgram::layoutUniformValues(mat4 matrix,
const CrossfadeParameters& crossfade,
const UnwrappedTileID& tileID,
const TransformState& state,
+ const float opacity,
const float heightFactor,
const float pixelRatio,
const EvaluatedLight& light) {
@@ -61,6 +63,7 @@ FillExtrusionPatternProgram::layoutUniformValues(mat4 matrix,
return {
uniforms::matrix::Value( matrix ),
+ uniforms::opacity::Value( opacity ),
uniforms::scale::Value( {{pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale}} ),
uniforms::texsize::Value( atlasSize ),
uniforms::fade::Value( crossfade.t ),