From 2bf252ab0d844ed5171969da5a96da9b5c10bb33 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 8 Feb 2018 13:42:39 +0100 Subject: [PATCH] Add MODULE variable in the glsl file --- src/ol/render/webgl/circlereplay/defaultshader.glsl | 1 + src/ol/render/webgl/linestringreplay/defaultshader.glsl | 1 + src/ol/render/webgl/polygonreplay/defaultshader.glsl | 1 + src/ol/render/webgl/texturereplay/defaultshader.glsl | 1 + src/ol/renderer/webgl/defaultmapshader.glsl | 1 + src/ol/renderer/webgl/tilelayershader.glsl | 1 + src/ol/webgl/shader.mustache | 3 +++ src/ol/webgl/shaderlocations.mustache | 3 +++ tasks/glslunit.js | 5 +++++ 9 files changed, 17 insertions(+) diff --git a/src/ol/render/webgl/circlereplay/defaultshader.glsl b/src/ol/render/webgl/circlereplay/defaultshader.glsl index c68cceb08f..2fe5ee79e0 100644 --- a/src/ol/render/webgl/circlereplay/defaultshader.glsl +++ b/src/ol/render/webgl/circlereplay/defaultshader.glsl @@ -1,4 +1,5 @@ //! NAMESPACE=_ol_render_webgl_circlereplay_defaultshader_ +//! MODULE=ol/render/webgl/circlereplay/defaultshader //! COMMON diff --git a/src/ol/render/webgl/linestringreplay/defaultshader.glsl b/src/ol/render/webgl/linestringreplay/defaultshader.glsl index b04d05cdc3..276f84b3e0 100644 --- a/src/ol/render/webgl/linestringreplay/defaultshader.glsl +++ b/src/ol/render/webgl/linestringreplay/defaultshader.glsl @@ -1,4 +1,5 @@ //! NAMESPACE=_ol_render_webgl_linestringreplay_defaultshader_ +//! MODULE=ol/render/webgl/linestringreplay/defaultshader //! COMMON diff --git a/src/ol/render/webgl/polygonreplay/defaultshader.glsl b/src/ol/render/webgl/polygonreplay/defaultshader.glsl index 6e0ded8d5a..1e82284337 100644 --- a/src/ol/render/webgl/polygonreplay/defaultshader.glsl +++ b/src/ol/render/webgl/polygonreplay/defaultshader.glsl @@ -1,4 +1,5 @@ //! NAMESPACE=_ol_render_webgl_polygonreplay_defaultshader_ +//! MODULE=ol/render/webgl/polygonreplay/defaultshader //! COMMON diff --git a/src/ol/render/webgl/texturereplay/defaultshader.glsl b/src/ol/render/webgl/texturereplay/defaultshader.glsl index affbff08be..3194d70419 100644 --- a/src/ol/render/webgl/texturereplay/defaultshader.glsl +++ b/src/ol/render/webgl/texturereplay/defaultshader.glsl @@ -1,4 +1,5 @@ //! NAMESPACE=_ol_render_webgl_texturereplay_defaultshader_ +//! MODULE=ol/render/webgl/texturereplay/defaultshader //! COMMON diff --git a/src/ol/renderer/webgl/defaultmapshader.glsl b/src/ol/renderer/webgl/defaultmapshader.glsl index 6621e9cf22..54d2f6924e 100644 --- a/src/ol/renderer/webgl/defaultmapshader.glsl +++ b/src/ol/renderer/webgl/defaultmapshader.glsl @@ -1,4 +1,5 @@ //! NAMESPACE=_ol_renderer_webgl_defaultmapshader_ +//! MODULE=ol/renderer/webgl/defaultmapshader //! COMMON diff --git a/src/ol/renderer/webgl/tilelayershader.glsl b/src/ol/renderer/webgl/tilelayershader.glsl index 59b9aa04c8..46441e85d5 100644 --- a/src/ol/renderer/webgl/tilelayershader.glsl +++ b/src/ol/renderer/webgl/tilelayershader.glsl @@ -1,4 +1,5 @@ //! NAMESPACE=_ol_renderer_webgl_tilelayershader_ +//! MODULE=ol/renderer/webgl/tilelayershader //! COMMON diff --git a/src/ol/webgl/shader.mustache b/src/ol/webgl/shader.mustache index 347e4f2c9d..1809eaa6d5 100644 --- a/src/ol/webgl/shader.mustache +++ b/src/ol/webgl/shader.mustache @@ -1,3 +1,6 @@ +/** + * @module {{{module}}} + */ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. diff --git a/src/ol/webgl/shaderlocations.mustache b/src/ol/webgl/shaderlocations.mustache index 8d2f9e3f8e..4eeeca9f26 100644 --- a/src/ol/webgl/shaderlocations.mustache +++ b/src/ol/webgl/shaderlocations.mustache @@ -1,3 +1,6 @@ +/** + * @module {{{module}}}/Locations + */ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. diff --git a/tasks/glslunit.js b/tasks/glslunit.js index a81342c9a9..992a268421 100644 --- a/tasks/glslunit.js +++ b/tasks/glslunit.js @@ -67,6 +67,11 @@ function main(argv) { json.namespace = m[1]; return; } + m = line.match(/\/\/!\s+MODULE=(\S+)\s*$/); + if (m) { + json.module = m[1]; + return; + } m = line.match(/\/\/!\s+COMMON\s*$/); if (m) { block = 'common';