From 3380f0803a62525a6884ee4d05e103e072c36117 Mon Sep 17 00:00:00 2001 From: Molly Lloyd Date: Wed, 16 Nov 2016 17:34:33 -0800 Subject: [core] update native for line property function shaders changes (#6658) * [core] update shaders for line property functions update deps, define device pixel ratio for all shaders [core] create ShaderParameter struct to store pixel ratio and overdraw param repair rebase errs update shaders to include pixel ratio make sure collision_box never overdraws update test suite, move shaders to Painter::render so the correct pixel ratio is applied move shader compiling back to the Painter constructor rebase from shader --> program refactor re-factor parameters for collisionBox and debug programs remove unused vars from line-program, move blur math to shader update core files remove unecessary files update shaders PR, remove comments bump test suite sha fix formatting, incorporate feedback refactor program.hpp * [core] remove line transformations that were moved to the shaders, bump shader sha * [core] shorten ProgramParameter instantiation * [core] bump shader+test suite shas --- src/mbgl/renderer/painter.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mbgl/renderer/painter.hpp') diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 2aa317f95a..6d402b027b 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -67,7 +68,7 @@ struct FrameData { class Painter : private util::noncopyable { public: - Painter(gl::Context&, const TransformState&); + Painter(gl::Context&, const TransformState&, float pixelRatio); ~Painter(); void render(const style::Style&, -- cgit v1.2.1