Ansis Brammanis ff6a5ce5bc Merge remote-tracking branch 'origin/master' into new-labelling ...

Conflicts:
	src/mbgl/map/source.cpp
	src/mbgl/map/source.hpp
	src/mbgl/map/tile_data.cpp
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/vector_tile_data.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/text/glyph.hpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	test/suite

2015-05-28 20:01:15 -04:00

..

box_shader.cpp

port collision box debug rendering

2015-04-01 16:11:48 -07:00

box_shader.hpp

port collision box debug rendering

2015-04-01 16:11:48 -07:00

box.fragment.glsl

port collision box debug rendering

2015-04-01 16:11:48 -07:00

box.vertex.glsl

port collision box debug rendering

2015-04-01 16:11:48 -07:00

dot_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

dot_shader.hpp

make most headers private

2014-12-04 20:02:50 +01:00

dot.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

dot.vertex.glsl

make most headers private

2014-12-04 20:02:50 +01:00

gaussian_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

gaussian_shader.hpp

make most headers private

2014-12-04 20:02:50 +01:00

gaussian.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

gaussian.vertex.glsl

make most headers private

2014-12-04 20:02:50 +01:00

icon_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

icon_shader.hpp

remove in-shader label flipping

2015-03-30 17:48:52 -07:00

icon.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

icon.vertex.glsl

remove in-shader label flipping

2015-03-30 17:48:52 -07:00

line_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

line_shader.hpp

remove old dash support from line shader

2015-01-14 21:11:19 -05:00

line.fragment.glsl

remove old dash support from line shader

2015-01-14 21:11:19 -05:00

line.vertex.glsl

remove old dash support from line shader

2015-01-14 21:11:19 -05:00

linepattern_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

linepattern_shader.hpp

implement functions for line-image

2015-02-02 17:57:12 -08:00

linepattern.fragment.glsl

implement functions for line-image

2015-02-02 17:57:12 -08:00

linepattern.vertex.glsl

fix rendering errors

2014-12-12 12:37:55 +01:00

linesdf_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

linesdf_shader.hpp

transition dashes when resetting their stretch

2015-01-23 17:25:31 -05:00

linesdf.fragment.glsl

transition dashes when resetting their stretch

2015-01-23 17:25:31 -05:00

linesdf.vertex.glsl

transition dashes when resetting their stretch

2015-01-23 17:25:31 -05:00

outline_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

outline_shader.hpp

make most headers private

2014-12-04 20:02:50 +01:00

outline.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

outline.vertex.glsl

make most headers private

2014-12-04 20:02:50 +01:00

pattern_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

pattern_shader.hpp

implement functions for patterns

2015-02-02 14:46:48 -08:00

pattern.fragment.glsl

implement functions for patterns

2015-02-02 14:46:48 -08:00

pattern.vertex.glsl

implement functions for patterns

2015-02-02 14:46:48 -08:00

plain_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

plain_shader.hpp

make most headers private

2014-12-04 20:02:50 +01:00

plain.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

plain.vertex.glsl

make most headers private

2014-12-04 20:02:50 +01:00

raster_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

raster_shader.hpp

make most headers private

2014-12-04 20:02:50 +01:00

raster.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

raster.vertex.glsl

make most headers private

2014-12-04 20:02:50 +01:00

sdf_shader.cpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

sdf_shader.hpp

remove in-shader label flipping

2015-03-30 17:48:52 -07:00

sdf.fragment.glsl

make most headers private

2014-12-04 20:02:50 +01:00

sdf.vertex.glsl

remove in-shader label flipping

2015-03-30 17:48:52 -07:00

shader.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

shader.hpp

throw exception when shader compilation fails

2015-03-06 15:42:34 +01:00

uniform.cpp

update error reporting function

2014-12-10 13:21:08 +01:00

uniform.hpp

Fix uninitialized variable

2015-05-01 10:06:04 -04:00