summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/fill_program.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/fill_program.cpp')
-rw-r--r--src/mbgl/programs/fill_program.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp
index e0dfc71f81..703d61399f 100644
--- a/src/mbgl/programs/fill_program.cpp
+++ b/src/mbgl/programs/fill_program.cpp
@@ -30,13 +30,13 @@ FillPatternProgram::layoutUniformValues(mat4 matrix,
int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
return {
- uniforms::u_matrix::Value( matrix ),
- uniforms::u_world::Value( framebufferSize ),
- uniforms::u_texsize::Value( atlasSize ),
- uniforms::u_scale::Value({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} } ),
- uniforms::u_fade::Value( crossfade.t ),
- uniforms::u_pixel_coord_upper::Value( std::array<float, 2> {{ float(pixelX >> 16), float(pixelY >> 16) }}),
- uniforms::u_pixel_coord_lower::Value( std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }} )
+ uniforms::matrix::Value( matrix ),
+ uniforms::world::Value( framebufferSize ),
+ uniforms::texsize::Value( atlasSize ),
+ uniforms::scale::Value({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} } ),
+ uniforms::fade::Value( crossfade.t ),
+ uniforms::pixel_coord_upper::Value( std::array<float, 2> {{ float(pixelX >> 16), float(pixelY >> 16) }}),
+ uniforms::pixel_coord_lower::Value( std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }} )
};
}