diff options
author | Karim Naaji <karim.naaji@gmail.com> | 2020-06-01 15:34:22 -0700 |
---|---|---|
committer | Karim Naaji <karim.naaji@gmail.com> | 2020-06-01 15:34:22 -0700 |
commit | 2dfd8ba452ce1528965ea6bef3355e0f970142ec (patch) | |
tree | 0721825d2eedf76ce27445d5b3caefb4423acc8f /src/mbgl/programs/fill_program.cpp | |
parent | b675454edf4c2005dd6da3207ab4431135fb9f5e (diff) | |
download | qtlocation-mapboxgl-2dfd8ba452ce1528965ea6bef3355e0f970142ec.tar.gz |
Start adding new attributes and uniforms
Diffstat (limited to 'src/mbgl/programs/fill_program.cpp')
-rw-r--r-- | src/mbgl/programs/fill_program.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp index f314fcc597..744a1dd80b 100644 --- a/src/mbgl/programs/fill_program.cpp +++ b/src/mbgl/programs/fill_program.cpp @@ -16,8 +16,7 @@ FillPatternProgram::layoutUniformValues(mat4 matrix, Size atlasSize, const CrossfadeParameters& crossfade, const UnwrappedTileID& tileID, - const TransformState& state, - const float pixelRatio) { + const TransformState& state) { const auto tileRatio = 1 / tileID.pixelsToTileUnits(1, state.getIntegerZoom()); int32_t tileSizeAtNearestZoom = util::tileSize * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z); int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z)); @@ -27,7 +26,7 @@ FillPatternProgram::layoutUniformValues(mat4 matrix, uniforms::matrix::Value( matrix ), uniforms::world::Value( framebufferSize ), uniforms::texsize::Value( atlasSize ), - uniforms::scale::Value({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} } ), + uniforms::scale::Value({ {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) }} ) |