diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-20 15:27:13 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
| commit | be3b5917c169a6d5e6fcdc3cca15ca78e44dfd1d (patch) | |
| tree | af780c3b78e5d2df7d8bee1f55a6f471a8047801 /src/mbgl/renderer | |
| parent | 839f4687aacb98440f85660120173c9b9895f46a (diff) | |
| download | qtlocation-mapboxgl-be3b5917c169a6d5e6fcdc3cca15ca78e44dfd1d.tar.gz | |
[core] add generic base class for renderbuffers
Diffstat (limited to 'src/mbgl/renderer')
| -rw-r--r-- | src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/render_static_data.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 13ef84f169..c261e9048f 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -70,7 +70,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* optional<float> depthClearValue = {}; if (parameters.staticData.depthRenderbuffer->needsClearing()) depthClearValue = 1.0; // Flag the depth buffer as no longer needing to be cleared for the remainder of this pass. - parameters.staticData.depthRenderbuffer->shouldClear(false); + parameters.staticData.depthRenderbuffer->setShouldClear(false); glContext.setStencilMode(gfx::StencilMode::disabled()); glContext.clear(Color{ 0.0f, 0.0f, 0.0f, 0.0f }, depthClearValue, {}); diff --git a/src/mbgl/renderer/render_static_data.hpp b/src/mbgl/renderer/render_static_data.hpp index b57139b783..f6c40163ee 100644 --- a/src/mbgl/renderer/render_static_data.hpp +++ b/src/mbgl/renderer/render_static_data.hpp @@ -2,7 +2,7 @@ #include <mbgl/gfx/vertex_buffer.hpp> #include <mbgl/gfx/index_buffer.hpp> -#include <mbgl/gl/renderbuffer.hpp> +#include <mbgl/gfx/renderbuffer.hpp> #include <mbgl/programs/background_program.hpp> #include <mbgl/programs/extrusion_texture_program.hpp> #include <mbgl/programs/programs.hpp> @@ -32,7 +32,7 @@ public: SegmentVector<RasterAttributes> rasterSegments; SegmentVector<ExtrusionTextureAttributes> extrusionTextureSegments; - optional<gl::Renderbuffer<gfx::RenderbufferPixelType::Depth>> depthRenderbuffer; + optional<gfx::Renderbuffer<gfx::RenderbufferPixelType::Depth>> depthRenderbuffer; bool has3D = false; Size backendSize; diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index ea493b49eb..00e40ae485 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -398,11 +398,11 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { parameters.pass = RenderPass::Pass3D; if (!parameters.staticData.depthRenderbuffer || - parameters.staticData.depthRenderbuffer->size != parameters.staticData.backendSize) { + parameters.staticData.depthRenderbuffer->getSize() != parameters.staticData.backendSize) { parameters.staticData.depthRenderbuffer = - glContext.createRenderbuffer<gfx::RenderbufferPixelType::Depth>(parameters.staticData.backendSize); + parameters.context.createRenderbuffer<gfx::RenderbufferPixelType::Depth>(parameters.staticData.backendSize); } - parameters.staticData.depthRenderbuffer->shouldClear(true); + parameters.staticData.depthRenderbuffer->setShouldClear(true); uint32_t i = static_cast<uint32_t>(renderItems.size()) - 1; for (auto it = renderItems.begin(); it != renderItems.end(); ++it, --i) { |