diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-31 02:35:10 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-01 13:53:39 +0300 |
commit | 2038a21cb5d67890acafbd34bc55e365ed0043fe (patch) | |
tree | 78551ce4bd635966c1d1e22ad360731ec9da352f /src/mbgl/renderer/painter_line.cpp | |
parent | a3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff) | |
download | qtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz |
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/renderer/painter_line.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_line.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index e0592b4bc1..d9e3d4037b 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -72,8 +72,8 @@ void Painter::renderLine(LineBucket& bucket, linesdfShader->u_color = color; linesdfShader->u_opacity = opacity; - LinePatternPos posA = lineAtlas->getDashPosition(properties.lineDasharray.value.from, layout.lineCap == LineCapType::Round, glObjectStore); - LinePatternPos posB = lineAtlas->getDashPosition(properties.lineDasharray.value.to, layout.lineCap == LineCapType::Round, glObjectStore); + LinePatternPos posA = lineAtlas->getDashPosition(properties.lineDasharray.value.from, layout.lineCap == LineCapType::Round, store); + LinePatternPos posB = lineAtlas->getDashPosition(properties.lineDasharray.value.to, layout.lineCap == LineCapType::Round, store); const float widthA = posA.width * properties.lineDasharray.value.fromScale * layer.dashLineWidth; const float widthB = posB.width * properties.lineDasharray.value.toScale * layer.dashLineWidth; @@ -95,9 +95,9 @@ void Painter::renderLine(LineBucket& bucket, linesdfShader->u_image = 0; config.activeTexture = GL_TEXTURE0; - lineAtlas->bind(glObjectStore); + lineAtlas->bind(store); - bucket.drawLineSDF(*linesdfShader, glObjectStore); + bucket.drawLineSDF(*linesdfShader, store); } else if (!properties.linePattern.value.from.empty()) { optional<SpriteAtlasPosition> imagePosA = spriteAtlas->getPosition(properties.linePattern.value.from, true); @@ -137,9 +137,9 @@ void Painter::renderLine(LineBucket& bucket, linepatternShader->u_image = 0; config.activeTexture = GL_TEXTURE0; - spriteAtlas->bind(true, glObjectStore); + spriteAtlas->bind(true, store); - bucket.drawLinePatterns(*linepatternShader, glObjectStore); + bucket.drawLinePatterns(*linepatternShader, store); } else { config.program = lineShader->getID(); @@ -157,6 +157,6 @@ void Painter::renderLine(LineBucket& bucket, lineShader->u_color = color; lineShader->u_opacity = opacity; - bucket.drawLines(*lineShader, glObjectStore); + bucket.drawLines(*lineShader, store); } } |