summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/fill_program.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/fill_program.hpp')
-rw-r--r--src/mbgl/programs/fill_program.hpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index 8519e482d6..4684a84f54 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -21,17 +21,17 @@ template <class> class Faded;
using FillLayoutAttributes = PositionOnlyLayoutAttributes;
using FillUniforms = TypeList<
- uniforms::u_matrix,
- uniforms::u_world>;
+ uniforms::matrix,
+ uniforms::world>;
using FillPatternUniforms = TypeList<
- uniforms::u_matrix,
- uniforms::u_world,
- uniforms::u_texsize,
- uniforms::u_scale,
- uniforms::u_fade,
- uniforms::u_pixel_coord_upper,
- uniforms::u_pixel_coord_lower>;
+ uniforms::matrix,
+ uniforms::world,
+ uniforms::texsize,
+ uniforms::scale,
+ uniforms::fade,
+ uniforms::pixel_coord_upper,
+ uniforms::pixel_coord_lower>;
class FillProgram : public Program<
FillProgram,
@@ -60,7 +60,7 @@ class FillPatternProgram : public Program<
FillLayoutAttributes,
FillPatternUniforms,
TypeList<
- textures::u_image>,
+ textures::image>,
style::FillPaintProperties>
{
public:
@@ -93,7 +93,7 @@ class FillOutlinePatternProgram : public Program<
FillLayoutAttributes,
FillPatternUniforms,
TypeList<
- textures::u_image>,
+ textures::image>,
style::FillPaintProperties>
{
public: