[core] Fix overdraw mode on Linux
- Use glBindAttribLocation for GLSL attributes. - Create a separate shader for each shader that supports overdraw. Needed because each uniform location must be known for every program. - Create a separate VAO for each shader inside buckets. Needed because we can only bind a VAO to a specific shader. Fixes #5435.
This commit is contained in:
@@ -27,17 +27,19 @@ void Painter::renderCircle(CircleBucket& bucket,
|
||||
mat4 vtxMatrix = translatedMatrix(matrix, properties.circleTranslate, tileID,
|
||||
properties.circleTranslateAnchor);
|
||||
|
||||
config.program = isOverdraw() ? circleShader->getOverdrawID() : circleShader->getID();
|
||||
const auto& shader = isOverdraw() ? circleOverdrawShader : circleShader;
|
||||
|
||||
circleShader->u_matrix = vtxMatrix;
|
||||
circleShader->u_extrude_scale = extrudeScale;
|
||||
circleShader->u_devicepixelratio = frame.pixelRatio;
|
||||
circleShader->u_color = properties.circleColor;
|
||||
circleShader->u_radius = properties.circleRadius;
|
||||
circleShader->u_blur = properties.circleBlur;
|
||||
circleShader->u_opacity = properties.circleOpacity;
|
||||
config.program = shader->getID();
|
||||
|
||||
bucket.drawCircles(*circleShader, store);
|
||||
shader->u_matrix = vtxMatrix;
|
||||
shader->u_extrude_scale = extrudeScale;
|
||||
shader->u_devicepixelratio = frame.pixelRatio;
|
||||
shader->u_color = properties.circleColor;
|
||||
shader->u_radius = properties.circleRadius;
|
||||
shader->u_blur = properties.circleBlur;
|
||||
shader->u_opacity = properties.circleOpacity;
|
||||
|
||||
bucket.drawCircles(*shader, store);
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
Reference in New Issue
Block a user