Named exports from WebGL shaders

src/ol/renderer/webgl/Layer.js

@@ -6,7 +6,7 @@ import RenderEvent from '../../render/Event.js';
 import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
 import LayerRenderer from '../Layer.js';
-import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js';
+import {fragment, vertex} from '../webgl/defaultmapshader.js';
 import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmapshader/Locations.js';
 import _ol_transform_ from '../../transform.js';
 import {create, fromTransform} from '../../vec/mat4.js';
@@ -148,8 +148,8 @@ WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, con
 
   const gl = context.getGL();
 
-  const fragmentShader = _ol_renderer_webgl_defaultmapshader_.fragment;
-  const vertexShader = _ol_renderer_webgl_defaultmapshader_.vertex;
+  const fragmentShader = fragment;
+  const vertexShader = vertex;
 
   const program = context.getProgram(fragmentShader, vertexShader);
 

src/ol/renderer/webgl/TileLayer.js

@@ -13,7 +13,7 @@ import {createEmpty, intersects} from '../../extent.js';
 import {roundUpToPowerOfTwo} from '../../math.js';
 import RendererType from '../Type.js';
 import WebGLLayerRenderer from '../webgl/Layer.js';
-import _ol_renderer_webgl_tilelayershader_ from '../webgl/tilelayershader.js';
+import {fragment, vertex} from '../webgl/tilelayershader.js';
 import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayershader/Locations.js';
 import {toSize} from '../../size.js';
 import _ol_transform_ from '../../transform.js';
@@ -35,13 +35,13 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
    * @private
    * @type {ol.webgl.Fragment}
    */
-  this.fragmentShader_ = _ol_renderer_webgl_tilelayershader_.fragment;
+  this.fragmentShader_ = fragment;
 
   /**
    * @private
    * @type {ol.webgl.Vertex}
    */
-  this.vertexShader_ = _ol_renderer_webgl_tilelayershader_.vertex;
+  this.vertexShader_ = vertex;
 
   /**
    * @private

src/ol/renderer/webgl/defaultmapshader.js

@@ -1,17 +1,17 @@
+/**
+ * @module ol/renderer/webgl/defaultmapshader
+ */
 // This file is automatically generated, do not edit.
 // Run `make shaders` to generate, and commit the result.
 
 import {DEBUG_WEBGL} from '../../index.js';
 import _ol_webgl_Fragment_ from '../../webgl/Fragment.js';
 import _ol_webgl_Vertex_ from '../../webgl/Vertex.js';
-const _ol_renderer_webgl_defaultmapshader_ = {};
 
-_ol_renderer_webgl_defaultmapshader_.fragment = new _ol_webgl_Fragment_(DEBUG_WEBGL ?
+export const fragment = new _ol_webgl_Fragment_(DEBUG_WEBGL ?
   'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform float u_opacity;\nuniform sampler2D u_texture;\n\nvoid main(void) {\n  vec4 texColor = texture2D(u_texture, v_texCoord);\n  gl_FragColor.rgb = texColor.rgb;\n  gl_FragColor.a = texColor.a * u_opacity;\n}\n' :
   'precision mediump float;varying vec2 a;uniform float f;uniform sampler2D g;void main(void){vec4 texColor=texture2D(g,a);gl_FragColor.rgb=texColor.rgb;gl_FragColor.a=texColor.a*f;}');
 
-_ol_renderer_webgl_defaultmapshader_.vertex = new _ol_webgl_Vertex_(DEBUG_WEBGL ?
+export const vertex = new _ol_webgl_Vertex_(DEBUG_WEBGL ?
   'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\n\nuniform mat4 u_texCoordMatrix;\nuniform mat4 u_projectionMatrix;\n\nvoid main(void) {\n  gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.);\n  v_texCoord = (u_texCoordMatrix * vec4(a_texCoord, 0., 1.)).st;\n}\n\n\n' :
   'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform mat4 d;uniform mat4 e;void main(void){gl_Position=e*vec4(b,0.,1.);a=(d*vec4(c,0.,1.)).st;}');
-
-export default _ol_renderer_webgl_defaultmapshader_;

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

@@ -2,6 +2,8 @@
  * @module ol/renderer/webgl/defaultmapshader/Locations
  */
 // This file is automatically generated, do not edit
+// Run `make shaders` to generate, and commit the result.
+
 import {DEBUG_WEBGL} from '../../../index.js';
 
 /**

src/ol/renderer/webgl/tilelayershader.js

@@ -1,17 +1,17 @@
+/**
+ * @module ol/renderer/webgl/tilelayershader
+ */
 // This file is automatically generated, do not edit.
 // Run `make shaders` to generate, and commit the result.
 
 import {DEBUG_WEBGL} from '../../index.js';
 import _ol_webgl_Fragment_ from '../../webgl/Fragment.js';
 import _ol_webgl_Vertex_ from '../../webgl/Vertex.js';
-const _ol_renderer_webgl_tilelayershader_ = {};
 
-_ol_renderer_webgl_tilelayershader_.fragment = new _ol_webgl_Fragment_(DEBUG_WEBGL ?
+export const fragment = new _ol_webgl_Fragment_(DEBUG_WEBGL ?
   'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform sampler2D u_texture;\n\nvoid main(void) {\n  gl_FragColor = texture2D(u_texture, v_texCoord);\n}\n' :
   'precision mediump float;varying vec2 a;uniform sampler2D e;void main(void){gl_FragColor=texture2D(e,a);}');
 
-_ol_renderer_webgl_tilelayershader_.vertex = new _ol_webgl_Vertex_(DEBUG_WEBGL ?
+export const vertex = new _ol_webgl_Vertex_(DEBUG_WEBGL ?
   'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nuniform vec4 u_tileOffset;\n\nvoid main(void) {\n  gl_Position = vec4(a_position * u_tileOffset.xy + u_tileOffset.zw, 0., 1.);\n  v_texCoord = a_texCoord;\n}\n\n\n' :
   'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform vec4 d;void main(void){gl_Position=vec4(b*d.xy+d.zw,0.,1.);a=c;}');
-
-export default _ol_renderer_webgl_tilelayershader_;

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

@@ -2,6 +2,8 @@
  * @module ol/renderer/webgl/tilelayershader/Locations
  */
 // This file is automatically generated, do not edit
+// Run `make shaders` to generate, and commit the result.
+
 import {DEBUG_WEBGL} from '../../../index.js';
 
 /**