[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.
This commit is contained in:
@@ -23,13 +23,14 @@ void Painter::renderCircle(PaintParameters& parameters,
|
||||
const CirclePaintProperties& properties = layer.impl->paint;
|
||||
const bool scaleWithMap = properties.circlePitchScale.value == CirclePitchScaleType::Map;
|
||||
|
||||
context.draw({
|
||||
parameters.programs.circle.draw(
|
||||
context,
|
||||
gl::Triangles(),
|
||||
depthModeForSublayer(0, gl::DepthMode::ReadOnly),
|
||||
frame.mapMode == MapMode::Still
|
||||
? stencilModeForClipping(tile.clip)
|
||||
: gl::StencilMode::disabled(),
|
||||
colorModeForRenderPass(),
|
||||
parameters.programs.circle,
|
||||
CircleProgram::UniformValues {
|
||||
uniforms::u_matrix::Value{ tile.translatedMatrix(properties.circleTranslate.value,
|
||||
properties.circleTranslateAnchor.value,
|
||||
@@ -47,12 +48,10 @@ void Painter::renderCircle(PaintParameters& parameters,
|
||||
: pixelsToGLUnits },
|
||||
uniforms::u_devicepixelratio::Value{ frame.pixelRatio },
|
||||
},
|
||||
gl::Segmented<gl::Triangles>(
|
||||
*bucket.vertexBuffer,
|
||||
*bucket.indexBuffer,
|
||||
bucket.segments
|
||||
)
|
||||
});
|
||||
*bucket.vertexBuffer,
|
||||
*bucket.indexBuffer,
|
||||
bucket.segments
|
||||
);
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
Reference in New Issue
Block a user