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_fill.cpp | |
parent | a3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff) | |
download | qtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz |
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/renderer/painter_fill.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_fill.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index ed0b3eec53..51cfa1b068 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -61,7 +61,7 @@ void Painter::renderFill(FillBucket& bucket, static_cast<float>(frame.framebufferSize[1]) }}; setDepthSublayer(0); - bucket.drawVertices(*outlineShader, glObjectStore); + bucket.drawVertices(*outlineShader, store); } if (pattern) { @@ -112,11 +112,11 @@ void Painter::renderFill(FillBucket& bucket, patternShader->u_offset_b = std::array<float, 2>{{offsetBx, offsetBy}}; config.activeTexture = GL_TEXTURE0; - spriteAtlas->bind(true, glObjectStore); + spriteAtlas->bind(true, store); // Draw the actual triangles into the color & stencil buffer. setDepthSublayer(0); - bucket.drawElements(*patternShader, glObjectStore); + bucket.drawElements(*patternShader, store); if (properties.fillAntialias && stroke_color == fill_color) { config.program = outlinePatternShader->getID(); @@ -150,10 +150,10 @@ void Painter::renderFill(FillBucket& bucket, outlinePatternShader->u_offset_b = std::array<float, 2>{{offsetBx, offsetBy}}; config.activeTexture = GL_TEXTURE0; - spriteAtlas->bind(true, glObjectStore); + spriteAtlas->bind(true, store); setDepthSublayer(2); - bucket.drawVertices(*outlinePatternShader, glObjectStore); + bucket.drawVertices(*outlinePatternShader, store); } } } else if (!wireframe) { @@ -170,7 +170,7 @@ void Painter::renderFill(FillBucket& bucket, // Draw the actual triangles into the color & stencil buffer. setDepthSublayer(1); - bucket.drawElements(*plainShader, glObjectStore); + bucket.drawElements(*plainShader, store); } } @@ -191,6 +191,6 @@ void Painter::renderFill(FillBucket& bucket, }}; setDepthSublayer(2); - bucket.drawVertices(*outlineShader, glObjectStore); + bucket.drawVertices(*outlineShader, store); } } |