diff options
author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2017-07-27 14:54:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-27 14:54:03 -0700 |
commit | ba7574ec51e2cfd4a55565d5a8337c47f1784bc2 (patch) | |
tree | c9f36f4b0a0ec24228b5ff39aac082252e9d8e21 /src/mbgl/renderer/sources/render_image_source.cpp | |
parent | 175e7e26e2008d1e55664bd1064536c23b6de86a (diff) | |
download | qtlocation-mapboxgl-ba7574ec51e2cfd4a55565d5a8337c47f1784bc2.tar.gz |
[core] modify texture coordinate scaling (#9153)
ignore unsupported dds property tests
fix tests
remove unneeded texture extent variable
bump gl-js to master
Diffstat (limited to 'src/mbgl/renderer/sources/render_image_source.cpp')
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 11ff8c26b1..50d5b17ec2 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -10,6 +10,7 @@ #include <mbgl/util/tile_coordinate.hpp> #include <mbgl/util/tile_cover.hpp> #include <mbgl/util/logging.hpp> +#include <mbgl/util/constants.hpp> namespace mbgl { @@ -193,11 +194,11 @@ void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_, bucket->vertices.emplace_back( RasterProgram::layoutVertex({ geomCoords[0].x, geomCoords[0].y }, { 0, 0 })); bucket->vertices.emplace_back( - RasterProgram::layoutVertex({ geomCoords[1].x, geomCoords[1].y }, { 32767, 0 })); + RasterProgram::layoutVertex({ geomCoords[1].x, geomCoords[1].y }, { util::EXTENT, 0 })); bucket->vertices.emplace_back( - RasterProgram::layoutVertex({ geomCoords[3].x, geomCoords[3].y }, { 0, 32767 })); + RasterProgram::layoutVertex({ geomCoords[3].x, geomCoords[3].y }, { 0, util::EXTENT })); bucket->vertices.emplace_back( - RasterProgram::layoutVertex({ geomCoords[2].x, geomCoords[2].y }, { 32767, 32767 })); + RasterProgram::layoutVertex({ geomCoords[2].x, geomCoords[2].y }, { util::EXTENT, util::EXTENT })); bucket->indices.emplace_back(0, 1, 2); bucket->indices.emplace_back(1, 2, 3); |