diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-07 12:26:05 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-08 08:09:29 -0800 |
| commit | 1db2ffbc1b69069eca39f786cacc45dbb02c3052 (patch) | |
| tree | 9d6ed2a7302492f41c52ea3fdeadabf6466b0d8d /src/mbgl/programs/fill_program.hpp | |
| parent | 66bdbc3b969083b9d647abdf72784be64a125949 (diff) | |
| download | qtlocation-mapboxgl-1db2ffbc1b69069eca39f786cacc45dbb02c3052.tar.gz | |
[core] Use gl::Program to resolve some rough edges in the GL binding types
* Extract `ignore` util to separate header.
* `Segment` now tracks offset and length of indices, rather than primitives. This is more natural.
* Introduce `VertexVector` and `IndexVector` types. These types carry information about the intended draw mode (`Triangles`, `LineStrip`, etc.), and ensure that elements are always appended in a group size appropriate for that draw mode, for both indexed and unindexed rendering.
* `Program`, rather than `Drawable`, is now the unifying object for draw calls. `Program` is the best place to type check the draw call, because it is typed to carry information about the intended primitive, vertex type, attributes, and uniforms.
* Use the debug shaders for debug tile rendering, like gl-js.
* Fix the draw mode for background. It was drawing triangle strips with a triangles array. Surprised this didn’t cause issues. Now it’s type checked.
Diffstat (limited to 'src/mbgl/programs/fill_program.hpp')
| -rw-r--r-- | src/mbgl/programs/fill_program.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp index 3f738527c8..d885215c59 100644 --- a/src/mbgl/programs/fill_program.hpp +++ b/src/mbgl/programs/fill_program.hpp @@ -86,6 +86,7 @@ struct FillPatternUniforms : gl::Uniforms< class FillProgram : public Program< shaders::fill, + gl::Triangle, FillAttributes, FillUniforms> { @@ -94,6 +95,7 @@ class FillProgram : public Program< class FillPatternProgram : public Program< shaders::fill_pattern, + gl::Triangle, FillAttributes, FillPatternUniforms> { @@ -102,6 +104,7 @@ class FillPatternProgram : public Program< class FillOutlineProgram : public Program< shaders::fill_outline, + gl::Line, FillAttributes, FillUniforms> { @@ -110,6 +113,7 @@ class FillOutlineProgram : public Program< class FillOutlinePatternProgram : public Program< shaders::fill_outline_pattern, + gl::Line, FillAttributes, FillPatternUniforms> { |