summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/fill_program.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-05-17 18:19:48 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-05-23 12:59:27 -0700
commit71c8f6aa10368084bc0a365b15f004d0629a8b67 (patch)
tree14f22e8b37c0ca5112f5c4cefe34e72882dee3b7 /src/mbgl/programs/fill_program.hpp
parent72b13cef6a83594b15f47bfeaee782504def619e (diff)
downloadqtlocation-mapboxgl-71c8f6aa10368084bc0a365b15f004d0629a8b67.tar.gz
[core] Move pattern coordinate division by texture size into shader
This makes pattern usage more like icons, and will be necessary for data-driven *-pattern properties.
Diffstat (limited to 'src/mbgl/programs/fill_program.hpp')
-rw-r--r--src/mbgl/programs/fill_program.hpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index 63751e740a..093485fc7f 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -33,6 +33,7 @@ struct FillUniforms : gl::Uniforms<
struct FillPatternUniforms : gl::Uniforms<
uniforms::u_matrix,
uniforms::u_world,
+ uniforms::u_texsize,
uniforms::u_pattern_tl_a,
uniforms::u_pattern_br_a,
uniforms::u_pattern_tl_b,
@@ -49,6 +50,7 @@ struct FillPatternUniforms : gl::Uniforms<
{
static Values values(mat4 matrix,
Size framebufferSize,
+ Size atlasSize,
const SpriteAtlasElement&,
const SpriteAtlasElement&,
const Faded<std::string>&,