summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/fill_program.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-07 17:50:02 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-12 11:03:54 +0100
commite27f33062994a1b0155b44b9d471e48e93b09f8e (patch)
treeeff2ba71134b9721c16fd53378b9256b94396712 /src/mbgl/programs/fill_program.hpp
parentcb64c380fbbd209cb68af60e76b7a770805353a8 (diff)
downloadqtlocation-mapboxgl-e27f33062994a1b0155b44b9d471e48e93b09f8e.tar.gz
[core] add texture bindings to draw call instead of Context member fn
Diffstat (limited to 'src/mbgl/programs/fill_program.hpp')
-rw-r--r--src/mbgl/programs/fill_program.hpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index 47d09912ad..5c0fbdcb62 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -3,6 +3,7 @@
#include <mbgl/programs/program.hpp>
#include <mbgl/programs/attributes.hpp>
#include <mbgl/programs/uniforms.hpp>
+#include <mbgl/programs/textures.hpp>
#include <mbgl/shaders/fill.hpp>
#include <mbgl/shaders/fill_pattern.hpp>
#include <mbgl/shaders/fill_outline.hpp>
@@ -33,7 +34,6 @@ using FillPatternUniforms = TypeList<
uniforms::u_texsize,
uniforms::u_scale,
uniforms::u_fade,
- uniforms::u_image,
uniforms::u_pixel_coord_upper,
uniforms::u_pixel_coord_lower>;
@@ -63,7 +63,8 @@ class FillPatternProgram : public Program<
gfx::Triangle,
FillLayoutAttributes,
FillPatternUniforms,
- TypeList<>,
+ TypeList<
+ textures::u_image>,
style::FillPaintProperties>
{
public:
@@ -95,7 +96,8 @@ class FillOutlinePatternProgram : public Program<
gfx::Line,
FillLayoutAttributes,
FillPatternUniforms,
- TypeList<>,
+ TypeList<
+ textures::u_image>,
style::FillPaintProperties>
{
public: