[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
This commit is contained in:
Molly Lloyd
2016-11-16 17:34:33 -08:00
committed by GitHub
parent a5ac643166
commit 3380f0803a
13 changed files with 75 additions and 68 deletions

View File

@@ -11,7 +11,6 @@ namespace mbgl {
namespace uniforms {
MBGL_DEFINE_UNIFORM_SCALAR(float, u_radius);
MBGL_DEFINE_UNIFORM_SCALAR(bool, u_scale_with_map);
MBGL_DEFINE_UNIFORM_SCALAR(float, u_devicepixelratio);
} // namespace uniforms
using CircleAttributes = gl::Attributes<
@@ -28,8 +27,7 @@ class CircleProgram : public Program<
uniforms::u_radius,
uniforms::u_blur,
uniforms::u_scale_with_map,
uniforms::u_extrude_scale,
uniforms::u_devicepixelratio>>
uniforms::u_extrude_scale>>
{
public:
using Program::Program;