diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-03 13:51:51 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-07 11:27:36 -0600 |
| commit | 9f2f7ddd12a4aaab0faddbe60cfb7c1e526fa7ff (patch) | |
| tree | 4350fce48dd97f6088dae94245265cd900f3de1f /src/mbgl/programs | |
| parent | d9f2cd5df50f5eee141b0a17e4e2ec8a4a7c4f78 (diff) | |
| download | qtlocation-mapboxgl-9f2f7ddd12a4aaab0faddbe60cfb7c1e526fa7ff.tar.gz | |
[core] Check in generated shader code
One step toward eliminating the node/npm dependency for platforms other than node.
Diffstat (limited to 'src/mbgl/programs')
| -rw-r--r-- | src/mbgl/programs/circle_program.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/programs/debug_program.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/programs/fill_program.hpp | 8 | ||||
| -rw-r--r-- | src/mbgl/programs/line_program.hpp | 6 | ||||
| -rw-r--r-- | src/mbgl/programs/raster_program.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp index 60a5faf649..8f056048b1 100644 --- a/src/mbgl/programs/circle_program.hpp +++ b/src/mbgl/programs/circle_program.hpp @@ -3,7 +3,7 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/circle.hpp> +#include <mbgl/shaders/circle.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/style/layers/circle_layer_properties.hpp> diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index e59aa5ac8b..78ed6aa0c9 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -3,7 +3,7 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/collision_box.hpp> +#include <mbgl/shaders/collision_box.hpp> #include <mbgl/util/geometry.hpp> #include <cmath> diff --git a/src/mbgl/programs/debug_program.hpp b/src/mbgl/programs/debug_program.hpp index 6b3b479d24..de1666b4a8 100644 --- a/src/mbgl/programs/debug_program.hpp +++ b/src/mbgl/programs/debug_program.hpp @@ -3,7 +3,7 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/debug.hpp> +#include <mbgl/shaders/debug.hpp> namespace mbgl { diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp index 600e25bb46..5406a5999c 100644 --- a/src/mbgl/programs/fill_program.hpp +++ b/src/mbgl/programs/fill_program.hpp @@ -3,10 +3,10 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/fill.hpp> -#include <mbgl/shader/fill_pattern.hpp> -#include <mbgl/shader/fill_outline.hpp> -#include <mbgl/shader/fill_outline_pattern.hpp> +#include <mbgl/shaders/fill.hpp> +#include <mbgl/shaders/fill_pattern.hpp> +#include <mbgl/shaders/fill_outline.hpp> +#include <mbgl/shaders/fill_outline_pattern.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/util/mat4.hpp> #include <mbgl/util/size.hpp> diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp index f4e3fe3d50..76329a463f 100644 --- a/src/mbgl/programs/line_program.hpp +++ b/src/mbgl/programs/line_program.hpp @@ -3,9 +3,9 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/line.hpp> -#include <mbgl/shader/line_pattern.hpp> -#include <mbgl/shader/line_sdf.hpp> +#include <mbgl/shaders/line.hpp> +#include <mbgl/shaders/line_pattern.hpp> +#include <mbgl/shaders/line_sdf.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/style/layers/line_layer_properties.hpp> diff --git a/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp index 7b4c3842be..09cb94ac17 100644 --- a/src/mbgl/programs/raster_program.hpp +++ b/src/mbgl/programs/raster_program.hpp @@ -3,7 +3,7 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/raster.hpp> +#include <mbgl/shaders/raster.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/style/layers/raster_layer_properties.hpp> diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 0130255356..e0e90f0fa4 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -3,8 +3,8 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> -#include <mbgl/shader/symbol_icon.hpp> -#include <mbgl/shader/symbol_sdf.hpp> +#include <mbgl/shaders/symbol_icon.hpp> +#include <mbgl/shaders/symbol_sdf.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/util/size.hpp> #include <mbgl/style/layers/symbol_layer_properties.hpp> |