diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-27 13:00:27 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-27 11:03:29 -0700 |
commit | ce42d22984d19fa020e6fba77e2585c0fd9dacf4 (patch) | |
tree | 76e1a33a58bfb023987de1cc7aca59e649624db3 /src/mbgl/renderer/painter_raster.cpp | |
parent | 21386b31465302d63cae5d93680442555c8560f1 (diff) | |
download | qtlocation-mapboxgl-ce42d22984d19fa020e6fba77e2585c0fd9dacf4.tar.gz |
[core] rename gl::Config to gl::Context
Diffstat (limited to 'src/mbgl/renderer/painter_raster.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_raster.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp index 8f6a1ac27b..16808f80a6 100644 --- a/src/mbgl/renderer/painter_raster.cpp +++ b/src/mbgl/renderer/painter_raster.cpp @@ -23,7 +23,7 @@ void Painter::renderRaster(PaintParameters& parameters, auto& rasterShader = parameters.shaders.raster; auto& rasterVAO = parameters.shaders.coveringRasterArray; - config.program = rasterShader.getID(); + context.program = rasterShader.getID(); rasterShader.u_matrix = tile.matrix; rasterShader.u_buffer_scale = 1.0f; rasterShader.u_opacity0 = properties.rasterOpacity; @@ -35,19 +35,19 @@ void Painter::renderRaster(PaintParameters& parameters, rasterShader.u_contrast_factor = contrastFactor(properties.rasterContrast); rasterShader.u_spin_weights = spinWeights(properties.rasterHueRotate); - config.stencilTest = GL_FALSE; + context.stencilTest = GL_FALSE; rasterShader.u_image0 = 0; // GL_TEXTURE0 rasterShader.u_image1 = 1; // GL_TEXTURE1 rasterShader.u_tl_parent = {{ 0.0f, 0.0f }}; rasterShader.u_scale_parent = 1.0f; - config.depthFunc.reset(); - config.depthTest = GL_TRUE; - config.depthMask = GL_FALSE; + context.depthFunc.reset(); + context.depthTest = GL_TRUE; + context.depthMask = GL_FALSE; setDepthSublayer(0); - bucket.drawRaster(rasterShader, rasterBoundsBuffer, rasterVAO, config, store); + bucket.drawRaster(rasterShader, rasterBoundsBuffer, rasterVAO, context, store); } } |