From 99af73ebaabd0d13e3db621f12e9887b23aa96e2 Mon Sep 17 00:00:00 2001 From: Tim Sylvester Date: Fri, 12 May 2023 10:09:45 -0700 Subject: [PATCH] Drawable Renderer (#1570), Tweak shader names --- src/mbgl/renderer/layers/render_background_layer.cpp | 2 +- src/mbgl/renderer/layers/render_fill_layer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index c41062d6e..7b185b1a0 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -213,7 +213,7 @@ void RenderBackgroundLayer::update(const int32_t layerIndex, std::unique_lock guard(mutex); if (!shader) { - shader = context.getGenericShader(shaders, "BackgroundDrawable"); + shader = context.getGenericShader(shaders, "BackgroundShader"); } const auto removeAll = [&](){ diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index b56e2e49b..591b0e0e9 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -277,10 +277,10 @@ void RenderFillLayer::update(const int32_t layerIndex, std::unique_lock guard(mutex); if (!shader) { - shader = context.getGenericShader(shaders, "FillDrawable"); + shader = context.getGenericShader(shaders, "FillShader"); } - if (!renderTiles || renderTiles->empty()) { + if (!shader || !renderTiles || renderTiles->empty()) { if (tileLayerGroup) { stats.tileDrawablesRemoved += tileLayerGroup->getDrawableCount(); tileLayerGroup->clearDrawables();