diff options
| author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2016-11-16 17:34:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 17:34:33 -0800 |
| commit | 3380f0803a62525a6884ee4d05e103e072c36117 (patch) | |
| tree | dd9263d66d91eea1f41f21d3eaf5173d12b559a2 /src/mbgl/programs/line_program.hpp | |
| parent | a5ac64316642cacb32466ea24ba2bf29b8d35da4 (diff) | |
| download | qtlocation-mapboxgl-3380f0803a62525a6884ee4d05e103e072c36117.tar.gz | |
[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
Diffstat (limited to 'src/mbgl/programs/line_program.hpp')
| -rw-r--r-- | src/mbgl/programs/line_program.hpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp index 07ae35b8ed..de3297de96 100644 --- a/src/mbgl/programs/line_program.hpp +++ b/src/mbgl/programs/line_program.hpp @@ -23,9 +23,8 @@ class SpriteAtlasPosition; namespace uniforms { MBGL_DEFINE_UNIFORM_SCALAR(float, u_ratio); -MBGL_DEFINE_UNIFORM_SCALAR(float, u_linewidth); +MBGL_DEFINE_UNIFORM_SCALAR(float, u_width); MBGL_DEFINE_UNIFORM_SCALAR(float, u_gapwidth); -MBGL_DEFINE_UNIFORM_SCALAR(float, u_antialiasing); MBGL_DEFINE_UNIFORM_SCALAR(float, u_extra); MBGL_DEFINE_UNIFORM_SCALAR(float, u_offset); MBGL_DEFINE_UNIFORM_SCALAR(float, u_tex_y_a); @@ -93,11 +92,10 @@ class LineProgram : public Program< gl::Uniforms< uniforms::u_matrix, uniforms::u_opacity, - uniforms::u_linewidth, + uniforms::u_width, uniforms::u_gapwidth, uniforms::u_blur, uniforms::u_offset, - uniforms::u_antialiasing, uniforms::u_antialiasingmatrix, uniforms::u_ratio, uniforms::u_extra, @@ -107,7 +105,6 @@ public: using Program::Program; static UniformValues uniformValues(const style::LinePaintProperties&, - float pixelRatio, const RenderTile&, const TransformState&); }; @@ -119,11 +116,10 @@ class LinePatternProgram : public Program< gl::Uniforms< uniforms::u_matrix, uniforms::u_opacity, - uniforms::u_linewidth, + uniforms::u_width, uniforms::u_gapwidth, uniforms::u_blur, uniforms::u_offset, - uniforms::u_antialiasing, uniforms::u_antialiasingmatrix, uniforms::u_ratio, uniforms::u_extra, @@ -140,7 +136,6 @@ public: using Program::Program; static UniformValues uniformValues(const style::LinePaintProperties&, - float pixelRatio, const RenderTile&, const TransformState&, const SpriteAtlasPosition& posA, @@ -154,11 +149,10 @@ class LineSDFProgram : public Program< gl::Uniforms< uniforms::u_matrix, uniforms::u_opacity, - uniforms::u_linewidth, + uniforms::u_width, uniforms::u_gapwidth, uniforms::u_blur, uniforms::u_offset, - uniforms::u_antialiasing, uniforms::u_antialiasingmatrix, uniforms::u_ratio, uniforms::u_extra, |