Updates after rebase

src/ol/renderer/Layer.js

@@ -195,11 +195,7 @@ class LayerRenderer extends Observable {
    */
   renderIfReadyAndVisible() {
     const layer = this.getLayer();
-    if (
+    if (layer && layer.getVisible() && 'ready') {
-      layer &&
-      layer.getVisible() &&
-      'ready'
-    ) {
       layer.changed();
     }
   }

src/ol/renderer/vector.js

@@ -387,10 +387,7 @@ function renderPointGeometry(
     if (opt_declutterBuilderGroup) {
       textBuilderGroup = opt_declutterBuilderGroup;
     }
-    const textReplay = textBuilderGroup.getBuilder(
+    const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
-      style.getZIndex(),
-      'Text'
-    );
     textReplay.setTextStyle(textStyle, declutterImageWithText);
     textReplay.drawText(geometry, feature);
   }
@@ -448,10 +445,7 @@ function renderMultiPointGeometry(
     if (opt_declutterBuilderGroup) {
       textBuilderGroup = opt_declutterBuilderGroup;
     }
-    const textReplay = textBuilderGroup.getBuilder(
+    const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
-      style.getZIndex(),
-      'Text'
-    );
     textReplay.setTextStyle(textStyle, declutterImageWithText);
     textReplay.drawText(geometry, feature);
   }

src/ol/renderer/webgl/TileLayer.js

@@ -725,7 +725,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
     let i, source, tileGrid;
     for (i = sources.length - 1; i >= 0; --i) {
       source = sources[i];
-      if (source.getState() === State.READY) {
+      if (source.getState() === 'ready') {
         tileGrid = source.getTileGridForProjection(viewState.projection);
         if (source.getWrapX()) {
           break;