Ansis Brammanis 7abd7950c9 Merge branch 'master' into new-labelling ...

Conflicts:
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/tile_parser.hpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_symbol.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/renderer/symbol_bucket.hpp
	src/mbgl/text/collision.cpp
	src/mbgl/text/collision.hpp
	src/mbgl/text/placement.cpp

2015-05-19 11:09:33 -04:00

..

anchor.hpp

port bboxifyLabel from -js

2015-04-01 19:03:01 -07:00

binpack.hpp

add BinPack test

2015-05-12 20:46:56 -07:00

buffer.hpp

upload all GL objects before rendering a frame

2015-05-04 17:33:05 +02:00

collision_box_buffer.cpp

port collision box debug rendering

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

collision_box_buffer.hpp

port collision box debug rendering

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

debug_font_buffer.cpp

make most headers private

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

debug_font_buffer.hpp

make most headers private

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

debug_font_data.hpp

make most headers private

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

elements_buffer.cpp

remove linejoin shader

2015-04-27 11:44:49 +02:00

elements_buffer.hpp

remove linejoin shader

2015-04-27 11:44:49 +02:00

fill_buffer.cpp

make most headers private

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

fill_buffer.hpp

make most headers private

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

glyph_atlas.cpp

manage atlas textures with unique_ptrs

2015-05-11 11:28:11 +02:00

glyph_atlas.hpp

manage atlas textures with unique_ptrs

2015-05-11 11:28:11 +02:00

icon_buffer.cpp

remove in-shader label flipping

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

icon_buffer.hpp

remove in-shader label flipping

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

line_atlas.cpp

manage atlas textures with unique_ptrs

2015-05-11 11:28:11 +02:00

line_atlas.hpp

manage atlas textures with unique_ptrs

2015-05-11 11:28:11 +02:00

line_buffer.cpp

use 4-byte aligned vertex attributes for performance reason

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

line_buffer.hpp

make most headers private

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

sprite_atlas.cpp

manage atlas textures with unique_ptrs

2015-05-11 11:28:11 +02:00

sprite_atlas.hpp

manage atlas textures with unique_ptrs

2015-05-11 11:28:11 +02:00

static_vertex_buffer.cpp

replace iterator variable types with auto

2015-04-01 16:42:42 +02:00

static_vertex_buffer.hpp

make most headers private

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

text_buffer.cpp

remove in-shader label flipping

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

text_buffer.hpp

remove in-shader label flipping

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

vao.cpp

Don't crash if VAO extensions are not available

2015-05-18 16:47:20 -07:00

vao.hpp

Don't crash if VAO extensions are not available

2015-05-18 16:47:20 -07:00