diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2015-11-04 13:37:00 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-11-04 13:38:51 +0100 |
commit | 8e63084c9e77486c9843ce469e0e8b663bfebb03 (patch) | |
tree | 4a3a224bda2450d15caa2915158b5bb677407d1c /src/mbgl/renderer/painter_line.cpp | |
parent | 1468ff13e338bec04b466cb95a28816a3852e487 (diff) | |
download | qtlocation-mapboxgl-8e63084c9e77486c9843ce469e0e8b663bfebb03.tar.gz |
[core] Move remaining GL state from Painter into GLConfig object
Diffstat (limited to 'src/mbgl/renderer/painter_line.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_line.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index 945022280a..6bf238aa42 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -69,7 +69,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI if (!properties.dash_array.from.empty()) { - useProgram(linesdfShader->program); + config.program = linesdfShader->program; linesdfShader->u_matrix = vtxMatrix; linesdfShader->u_exmatrix = extrudeMatrix; @@ -106,7 +106,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI float factor = 8.0 / std::pow(2, state.getIntegerZoom() - id.z) * id.overscaling; - useProgram(linepatternShader->program); + config.program = linepatternShader->program; linepatternShader->u_matrix = vtxMatrix; linepatternShader->u_exmatrix = extrudeMatrix; @@ -131,7 +131,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI bucket.drawLinePatterns(*linepatternShader); } else { - useProgram(lineShader->program); + config.program = lineShader->program; lineShader->u_matrix = vtxMatrix; lineShader->u_exmatrix = extrudeMatrix; |