From 66a74ac019377bfc0660ddf481f5130fa72a9ba3 Mon Sep 17 00:00:00 2001
From: Olivier Guyot <olivier.guyot@camptocamp.com>
Date: Fri, 16 Nov 2018 11:33:59 +0100
Subject: [PATCH] Renamed WebGLBuffer to WebGLArrayBuffer to avoid conflicts

In the future this should be reworked to have a clearer API in general.
---
 src/ol/renderer/webgl-new/PointsLayer.js | 6 +++---
 src/ol/webgl/Buffer.js                   | 4 ++--
 src/ol/webgl/Helper.js                   | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/ol/renderer/webgl-new/PointsLayer.js b/src/ol/renderer/webgl-new/PointsLayer.js
index c855d45092..4b2ba36c43 100644
--- a/src/ol/renderer/webgl-new/PointsLayer.js
+++ b/src/ol/renderer/webgl-new/PointsLayer.js
@@ -2,7 +2,7 @@
  * @module ol/renderer/webgl-new/PointsLayer
  */
 import LayerRenderer from '../Layer';
-import WebGLBuffer from '../../webgl/Buffer';
+import WebGLArrayBuffer from '../../webgl/Buffer';
 import {DYNAMIC_DRAW, ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, FLOAT} from '../../webgl';
 import WebGLHelper, {DefaultAttrib, DefaultUniform} from '../../webgl/Helper';
 import WebGLVertex from '../../webgl/Vertex';
@@ -143,8 +143,8 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
 
     this.sourceRevision_ = -1;
 
-    this.verticesBuffer_ = new WebGLBuffer([], DYNAMIC_DRAW);
-    this.indicesBuffer_ = new WebGLBuffer([], DYNAMIC_DRAW);
+    this.verticesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW);
+    this.indicesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW);
 
     const vertexShader = new WebGLVertex(options.vertexShader || VERTEX_SHADER);
     const fragmentShader = new WebGLFragment(options.fragmentShader || FRAGMENT_SHADER);
diff --git a/src/ol/webgl/Buffer.js b/src/ol/webgl/Buffer.js
index a545f745bf..42888a6eb6 100644
--- a/src/ol/webgl/Buffer.js
+++ b/src/ol/webgl/Buffer.js
@@ -13,7 +13,7 @@ const BufferUsage = {
 };
 
 
-class WebGLBuffer {
+class WebGLArrayBuffer {
 
   /**
    * @param {Array<number>=} opt_arr Array.
@@ -50,4 +50,4 @@ class WebGLBuffer {
   }
 }
 
-export default WebGLBuffer;
+export default WebGLArrayBuffer;
diff --git a/src/ol/webgl/Helper.js b/src/ol/webgl/Helper.js
index da13c6f90a..ec9f07e1db 100644
--- a/src/ol/webgl/Helper.js
+++ b/src/ol/webgl/Helper.js
@@ -17,7 +17,6 @@ import {
   translate as translateTransform
 } from '../transform';
 import {create, fromTransform} from '../vec/mat4';
-import WebGLBuffer from './Buffer';
 import WebGLPostProcessingPass from './PostProcessingPass';
 
 
@@ -142,15 +141,15 @@ export const DefaultAttrib = {
  *
  * ### Binding WebGL buffers and flushing data into them:
  *
- *   Data that must be passed to the GPU has to be transferred using `WebGLBuffer` objects.
+ *   Data that must be passed to the GPU has to be transferred using `WebGLArrayBuffer` objects.
  *   A buffer has to be created only once, but must be bound everytime the data it holds is changed. Using `WebGLHelper.bindBuffer`
  *   will bind the buffer and flush the new data to the GPU.
  *
  *   For now, the `WebGLHelper` class expects {@link module:ol/webgl/Buffer~WebGLArrayBuffer} objects.
  *   ```js
  *   // at initialization phase
- *   this.verticesBuffer = new WebGLBuffer([], DYNAMIC_DRAW);
- *   this.indicesBuffer = new WebGLBuffer([], DYNAMIC_DRAW);
+ *   this.verticesBuffer = new WebGLArrayBuffer([], DYNAMIC_DRAW);
+ *   this.indicesBuffer = new WebGLArrayBuffer([], DYNAMIC_DRAW);
  *
  *   // at rendering phase
  *   this.context.bindBuffer(ARRAY_BUFFER, this.verticesBuffer);