Rename location shader classes

And remove the now unneeded NAMESPACE variable

src/ol/renderer/webgl/Layer.js

@@ -7,7 +7,7 @@ import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
 import LayerRenderer from '../Layer.js';
 import {fragment, vertex} from '../webgl/defaultmapshader.js';
-import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmapshader/Locations.js';
+import Locations from '../webgl/defaultmapshader/Locations.js';
 import _ol_transform_ from '../../transform.js';
 import {create, fromTransform} from '../../vec/mat4.js';
 import _ol_webgl_ from '../../webgl.js';
@@ -155,7 +155,7 @@ WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, con
 
   let locations;
   if (!this.defaultLocations_) {
-    locations = new _ol_renderer_webgl_defaultmapshader_Locations_(gl, program);
+    locations = new Locations(gl, program);
     this.defaultLocations_ = locations;
   } else {
     locations = this.defaultLocations_;

src/ol/renderer/webgl/TileLayer.js

@@ -14,7 +14,7 @@ import {roundUpToPowerOfTwo} from '../../math.js';
 import RendererType from '../Type.js';
 import WebGLLayerRenderer from '../webgl/Layer.js';
 import {fragment, vertex} from '../webgl/tilelayershader.js';
-import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayershader/Locations.js';
+import Locations from '../webgl/tilelayershader/Locations.js';
 import {toSize} from '../../size.js';
 import _ol_transform_ from '../../transform.js';
 import _ol_webgl_ from '../../webgl.js';
@@ -223,7 +223,7 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
     const program = context.getProgram(this.fragmentShader_, this.vertexShader_);
     context.useProgram(program);
     if (!this.locations_) {
-      this.locations_ = new _ol_renderer_webgl_tilelayershader_Locations_(gl, program);
+      this.locations_ = new Locations(gl, program);
     }
 
     context.bindBuffer(_ol_webgl_.ARRAY_BUFFER, this.renderArrayBuffer_);

src/ol/renderer/webgl/defaultmapshader.glsl

@@ -1,4 +1,3 @@
-//! NAMESPACE=_ol_renderer_webgl_defaultmapshader_
 //! MODULE=ol/renderer/webgl/defaultmapshader
 
 

src/ol/renderer/webgl/defaultmapshader/Locations.js

@@ -12,7 +12,7 @@ import {DEBUG_WEBGL} from '../../../index.js';
  * @param {WebGLProgram} program Program.
  * @struct
  */
-const _ol_renderer_webgl_defaultmapshader_Locations_ = function(gl, program) {
+const Locations = function(gl, program) {
 
   /**
    * @type {WebGLUniformLocation}
@@ -51,4 +51,4 @@ const _ol_renderer_webgl_defaultmapshader_Locations_ = function(gl, program) {
     program, DEBUG_WEBGL ? 'a_texCoord' : 'c');
 };
 
-export default _ol_renderer_webgl_defaultmapshader_Locations_;
+export default Locations;

src/ol/renderer/webgl/tilelayershader.glsl

@@ -1,4 +1,3 @@
-//! NAMESPACE=_ol_renderer_webgl_tilelayershader_
 //! MODULE=ol/renderer/webgl/tilelayershader
 
 

src/ol/renderer/webgl/tilelayershader/Locations.js

@@ -12,7 +12,7 @@ import {DEBUG_WEBGL} from '../../../index.js';
  * @param {WebGLProgram} program Program.
  * @struct
  */
-const _ol_renderer_webgl_tilelayershader_Locations_ = function(gl, program) {
+const Locations = function(gl, program) {
 
   /**
    * @type {WebGLUniformLocation}
@@ -39,4 +39,4 @@ const _ol_renderer_webgl_tilelayershader_Locations_ = function(gl, program) {
     program, DEBUG_WEBGL ? 'a_texCoord' : 'c');
 };
 
-export default _ol_renderer_webgl_tilelayershader_Locations_;
+export default Locations;