diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-05-13 17:13:31 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-15 10:55:58 -0700 |
| commit | 867555b1c9ef51fec23ce77c682cf7d5b5a23c5e (patch) | |
| tree | de380cbb7f5553282b081dce9202cbe9e502ebe5 /src/mbgl/renderer/paint_parameters.cpp | |
| parent | 1a9e93e8d5fc6fd027160b3126eab03d0809ca69 (diff) | |
| download | qtlocation-mapboxgl-867555b1c9ef51fec23ce77c682cf7d5b5a23c5e.tar.gz | |
[core] add gfx::UploadPass, split startRender into prepare and uploadupstream/gfx-refactor-7
Diffstat (limited to 'src/mbgl/renderer/paint_parameters.cpp')
| -rw-r--r-- | src/mbgl/renderer/paint_parameters.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/renderer/paint_parameters.cpp b/src/mbgl/renderer/paint_parameters.cpp index e31392902e..38cdb11f9f 100644 --- a/src/mbgl/renderer/paint_parameters.cpp +++ b/src/mbgl/renderer/paint_parameters.cpp @@ -17,8 +17,7 @@ PaintParameters::PaintParameters(gfx::Context& context_, const EvaluatedLight& evaluatedLight_, RenderStaticData& staticData_, ImageManager& imageManager_, - LineAtlas& lineAtlas_, - Placement::VariableOffsets variableOffsets_) + LineAtlas& lineAtlas_) : context(context_), backend(backend_), encoder(context.createCommandEncoder()), @@ -31,7 +30,6 @@ PaintParameters::PaintParameters(gfx::Context& context_, debugOptions(updateParameters.debugOptions), timePoint(updateParameters.timePoint), pixelRatio(pixelRatio_), - variableOffsets(variableOffsets_), #ifndef NDEBUG programs((debugOptions & MapDebugOptions::Overdraw) ? staticData_.overdrawPrograms : staticData_.programs) #else @@ -135,7 +133,7 @@ void PaintParameters::renderTileClippingMasks(const std::vector<std::reference_w }, gfx::ColorMode::disabled(), gfx::CullFaceMode::disabled(), - staticData.quadTriangleIndexBuffer, + *staticData.quadTriangleIndexBuffer, staticData.tileTriangleSegments, program.computeAllUniformValues( ClippingMaskProgram::LayoutUniformValues { @@ -146,7 +144,7 @@ void PaintParameters::renderTileClippingMasks(const std::vector<std::reference_w state.getZoom() ), program.computeAllAttributeBindings( - staticData.tileVertexBuffer, + *staticData.tileVertexBuffer, paintAttributeData, properties ), |