From 8eef99ad04f399895d60634a4fc63a826ea842bb Mon Sep 17 00:00:00 2001
From: Florent gravin <florent.gravin@camptocamp.com>
Date: Thu, 15 Feb 2018 13:38:03 +0100
Subject: [PATCH] Webgl Layer and Context named exports

---
 src/ol/renderer/webgl/Layer.js |  4 ++--
 src/ol/renderer/webgl/Map.js   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js
index 85043191a5..391716c135 100644
--- a/src/ol/renderer/webgl/Layer.js
+++ b/src/ol/renderer/webgl/Layer.js
@@ -12,7 +12,7 @@ import _ol_transform_ from '../../transform.js';
 import {create, fromTransform} from '../../vec/mat4.js';
 import _ol_webgl_ from '../../webgl.js';
 import WebGLBuffer from '../../webgl/Buffer.js';
-import WebGLContext from '../../webgl/Context.js';
+import {createEmptyTexture} from '../../webgl/Context.js';
 
 /**
  * @constructor
@@ -116,7 +116,7 @@ WebGLLayerRenderer.prototype.bindFramebuffer = function(frameState, framebufferD
       /** @type {ol.PostRenderFunction} */ (postRenderFunction)
     );
 
-    const texture = WebGLContext.createEmptyTexture(
+    const texture = createEmptyTexture(
       gl, framebufferDimension, framebufferDimension);
 
     const framebuffer = gl.createFramebuffer();
diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js
index ec9a0fd90e..de9fa5024e 100644
--- a/src/ol/renderer/webgl/Map.js
+++ b/src/ol/renderer/webgl/Map.js
@@ -8,7 +8,7 @@ import {CLASS_UNSELECTABLE} from '../../css.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {listen} from '../../events.js';
 import {WEBGL} from '../../has.js';
-import Layer from '../../layer/Layer.js';
+import {visibleAtResolution} from '../../layer/Layer.js';
 import RenderEvent from '../../render/Event.js';
 import RenderEventType from '../../render/EventType.js';
 import WebGLImmediateRenderer from '../../render/webgl/Immediate.js';
@@ -450,7 +450,7 @@ WebGLMapRenderer.prototype.renderFrame = function(frameState) {
   let i, ii, layerRenderer, layerState;
   for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
     layerState = layerStatesArray[i];
-    if (Layer.visibleAtResolution(layerState, viewResolution) &&
+    if (visibleAtResolution(layerState, viewResolution) &&
         layerState.sourceState == SourceState.READY) {
       layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
       if (layerRenderer.prepareFrame(frameState, layerState, context)) {
@@ -525,7 +525,7 @@ WebGLMapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, fra
   for (i = numLayers - 1; i >= 0; --i) {
     const layerState = layerStates[i];
     const layer = layerState.layer;
-    if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
+    if (visibleAtResolution(layerState, viewState.resolution) &&
         layerFilter.call(thisArg2, layer)) {
       const layerRenderer = this.getLayerRenderer(layer);
       result = layerRenderer.forEachFeatureAtCoordinate(
@@ -557,7 +557,7 @@ WebGLMapRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameSt
   for (i = numLayers - 1; i >= 0; --i) {
     const layerState = layerStates[i];
     const layer = layerState.layer;
-    if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
+    if (visibleAtResolution(layerState, viewState.resolution) &&
         layerFilter.call(thisArg, layer)) {
       const layerRenderer = this.getLayerRenderer(layer);
       hasFeature =
@@ -589,7 +589,7 @@ WebGLMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, cal
   for (i = numLayers - 1; i >= 0; --i) {
     const layerState = layerStates[i];
     const layer = layerState.layer;
-    if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
+    if (visibleAtResolution(layerState, viewState.resolution) &&
         layerFilter.call(thisArg, layer)) {
       const layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layer));
       result = layerRenderer.forEachLayerAtPixel(