Merge branch 'topic/drawable-fixes' into topic/drawable (#1560)

Co-authored-by: Stefan Karschti <stefan.karschti@gmail.com>
Co-authored-by: Alex Cristici <alex.cristici@gmail.com>
Co-authored-by: Tim Sylvester <tim@wetdogweather.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

src/mbgl/renderer/pattern_atlas.cpp

@@ -107,18 +107,14 @@ void PatternAtlas::upload([[maybe_unused]] gfx::UploadPass& uploadPass) {
     dirty = false;
 }
 
+#if MLN_LEGACY_RENDERER
 // @note: Deprecated
 gfx::TextureBinding PatternAtlas::textureBinding() const {
-#if MLN_DRAWABLE_RENDERER
-    assert(atlasTexture2D);
-    assert(!dirty);
-    return {atlasTexture2D->getResource(), gfx::TextureFilterType::Linear};
-#else
     assert(atlasTexture);
     assert(!dirty);
     return {atlasTexture->getResource(), gfx::TextureFilterType::Linear};
-#endif
 }
+#endif
 
 #if MLN_DRAWABLE_RENDERER
 const std::shared_ptr<gfx::Texture2D>& PatternAtlas::texture() const {