Optimize shader preprocessing and program creation (internal-7984)

GitOrigin-RevId: a0be904f3ba66e2a0c242ab326053829205924a1

Author: stepankuzmin

build/rollup_plugins.js

@@ -51,7 +51,7 @@ export const plugins = ({mode, format, minified, production, test, bench, keepCl
             'process.env.UPDATE': JSON.stringify(process.env.UPDATE)
         }
     }) : false,
-    glsl(['./src/shaders/*.glsl', './3d-style/shaders/*.glsl'], production),
+    glsl(['./src/shaders/*.glsl', './3d-style/shaders/*.glsl']),
     minified ? terser({
         ecma: 2020,
         module: true,
@@ -72,30 +72,33 @@ export const plugins = ({mode, format, minified, production, test, bench, keepCl
     }),
 ].filter(Boolean);
 
-// Using this instead of rollup-plugin-string to add minification
-function glsl(include, minify) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+/**
+ * GLSL Shader Transform Plugin
+ * Performs lightweight minification: strips comments, collapses whitespace, and removes unnecessary line breaks.
+ * @param {string[]} include - Array of glob patterns to include
+ * @returns {import('rollup').Plugin} - Rollup plugin object
+ */
+function glsl(include) {
     const filter = createFilter(include);
+
+    const COMMENT_REGEX = /\s*\/\/.*$/gm;
+    const MULTILINE_REGEX = /\n+/g;
+    const INDENT_REGEX = /\n\s+/g;
+    const OPERATOR_REGEX = /\s?([+\-/*=,])\s?/g;
+    const LINEBREAK_REGEX = /([;,{}])\n(?=[^#])/g;
+
     return {
         name: 'glsl',
         transform(code, id) {
             if (!filter(id)) return;
 
-            // barebones GLSL minification
-            if (minify) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-                code = code.trim() // strip whitespace at the start/end
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    .replace(/\s*\/\/[^\n]*\n/g, '\n') // strip double-slash comments
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    .replace(/\n+/g, '\n') // collapse multi line breaks
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    .replace(/\n\s+/g, '\n') // strip indentation
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    .replace(/\s?([+-\/*=,])\s?/g, '$1') // strip whitespace around operators
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    .replace(/([;,\{\}])\n(?=[^#])/g, '$1'); // strip more line breaks
-            }
+            // GLSL minification
+            code = code.trim() // strip whitespace at the start/end
+                .replace(COMMENT_REGEX, '') // strip double-slash comments
+                .replace(MULTILINE_REGEX, '\n') // collapse multi line breaks
+                .replace(INDENT_REGEX, '\n') // strip indentation
+                .replace(OPERATOR_REGEX, '$1') // strip whitespace around operators
+                .replace(LINEBREAK_REGEX, '$1'); // strip more line breaks
 
             return {
                 code: `export default ${JSON.stringify(code)};`,

src/render/painter.ts

@@ -1699,7 +1699,7 @@ class Painter {
 
     getOrCreateProgram<T extends ProgramName>(name: T, options?: CreateProgramParams): Program<ProgramUniformsType[T]> {
         this.cache = this.cache || {};
-        const defines = ((options && options.defines) || []);
+        const defines = (options && options.defines) || [];
         const config = options && options.config;
         const overrideFog = options && options.overrideFog;
         const overrideRtt = options && options.overrideRtt;

src/render/program.ts

@@ -1,10 +1,7 @@
 import {
-    prelude,
-    preludeFragPrecisionQualifiers,
-    preludeVertPrecisionQualifiers,
-    preludeCommonSource,
     includeMap,
-    preludeFragExtensions,
+    FRAGMENT_PRELUDE_BLOCK,
+    VERTEX_PRELUDE_BLOCK
 } from '../shaders/shaders';
 import assert from 'assert';
 import VertexArrayObject from './vertex_array_object';
@@ -30,7 +27,7 @@ import type SegmentVector from '../data/segment';
 import type VertexBuffer from '../gl/vertex_buffer';
 import type IndexBuffer from '../gl/index_buffer';
 import type CullFaceMode from '../gl/cull_face_mode';
-import type {UniformBindings, UniformValues} from './uniform_binding';
+import type {UniformBindings, UniformValues, IUniform} from './uniform_binding';
 import type {BinderUniform} from '../data/program_configuration';
 import type Painter from './painter';
 import type {Segment} from "../data/segment";
@@ -44,7 +41,7 @@ export type DrawMode = WebGL2RenderingContext['POINTS'] | WebGL2RenderingContext
 export type ShaderSource = {
     fragmentSource: string;
     vertexSource: string;
-    usedDefines: Array<DynamicDefinesType>;
+    usedDefines: Set<DynamicDefinesType>;
     vertexIncludes: Array<string>;
     fragmentIncludes: Array<string>;
 };
@@ -76,7 +73,9 @@ const instancingUniforms = (context: Context): InstancingUniformType => ({
 class Program<Us extends UniformBindings> {
     program: WebGLProgram;
     attributes: Record<string, number>;
-    fixedUniforms: Us;
+    fixedUniforms: Readonly<Us>;
+    // Cache fixedUniforms entries to avoid allocations during draw calls
+    fixedUniformsEntries: ReadonlyArray<[string, IUniform<unknown>]>;
     binderUniforms: Array<BinderUniform>;
     failedToCreate: boolean;
     terrainUniforms: TerrainUniformsType | null | undefined;
@@ -88,7 +87,7 @@ class Program<Us extends UniformBindings> {
 
     name: ProgramName;
     configuration: ProgramConfiguration | null | undefined;
-    fixedDefines: DynamicDefinesType[];
+    fixedDefines: ReadonlyArray<DynamicDefinesType>;
 
     // Manually handle instancing by issuing draw calls and replacing gl_InstanceID with uniform
     forceManualRenderingForInstanceIDShaders: boolean;
@@ -100,13 +99,19 @@ class Program<Us extends UniformBindings> {
         defines: DynamicDefinesType[],
         programConfiguration?: ProgramConfiguration | null,
     ): string {
-        let key = `${name}${programConfiguration ? programConfiguration.cacheKey : ''}`;
+        const parts: string[] = [name];
+
+        if (programConfiguration) {
+            parts.push(programConfiguration.cacheKey);
+        }
+
         for (const define of defines) {
-            if (source.usedDefines.includes(define)) {
-                key += `/${define}`;
+            if (source.usedDefines.has(define)) {
+                parts.push(define as string);
             }
         }
-        return key;
+
+        return parts.join('/');
     }
 
     constructor(
@@ -124,44 +129,36 @@ class Program<Us extends UniformBindings> {
         this.name = name;
         this.fixedDefines = [...fixedDefines];
 
-        let defines = configuration ? configuration.defines() : [];
-        defines = defines.concat(fixedDefines.map((define) => `#define ${define}`));
-        const version = '#version 300 es\n';
+        const configDefines = configuration ? configuration.defines() : [];
+        const defines = configDefines.concat(fixedDefines.map((define) => `#define ${define}`)).join('\n');
+        const definesBlock = `#version 300 es\n${defines}`;
 
-        let fragmentSource = version + defines.concat(
-            preludeFragExtensions,
-            preludeFragPrecisionQualifiers,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            preludeCommonSource,
-            prelude.fragmentSource).join('\n');
+        const fragmentParts = [definesBlock, FRAGMENT_PRELUDE_BLOCK];
         for (const include of source.fragmentIncludes) {
-            fragmentSource += `\n${includeMap[include]}`;
+            fragmentParts.push(includeMap[include]);
         }
-        fragmentSource += `\n${source.fragmentSource}`;
 
-        let vertexSource = version + defines.concat(
-            preludeVertPrecisionQualifiers,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            preludeCommonSource,
-            prelude.vertexSource).join('\n');
+        fragmentParts.push(source.fragmentSource);
+        const fragmentSource = fragmentParts.join('\n');
+
+        const vertexParts = [definesBlock, VERTEX_PRELUDE_BLOCK];
         for (const include of source.vertexIncludes) {
-            vertexSource += `\n${includeMap[include]}`;
+            vertexParts.push(includeMap[include]);
         }
 
-        this.forceManualRenderingForInstanceIDShaders = context.forceManualRenderingForInstanceIDShaders && source.vertexSource.indexOf("gl_InstanceID") !== -1;
+        this.forceManualRenderingForInstanceIDShaders = context.forceManualRenderingForInstanceIDShaders && source.vertexSource.includes('gl_InstanceID');
 
         if (this.forceManualRenderingForInstanceIDShaders) {
-            vertexSource += `\nuniform int u_instanceID;\n`;
+            vertexParts.push('uniform int u_instanceID;');
         }
 
-        vertexSource += `\n${source.vertexSource}`;
+        vertexParts.push(source.vertexSource);
+        let vertexSource = vertexParts.join('\n');
 
         if (this.forceManualRenderingForInstanceIDShaders) {
-            vertexSource = vertexSource.replaceAll("gl_InstanceID", "u_instanceID");
+            vertexSource = vertexSource.replaceAll('gl_InstanceID', 'u_instanceID');
         }
 
-        // Replace
-
         const fragmentShader = (gl.createShader(gl.FRAGMENT_SHADER));
         if (gl.isContextLost()) {
             this.failedToCreate = true;
@@ -191,6 +188,7 @@ class Program<Us extends UniformBindings> {
         gl.deleteShader(fragmentShader);
 
         this.fixedUniforms = fixedUniforms(context);
+        this.fixedUniformsEntries = Object.entries(this.fixedUniforms);
         this.binderUniforms = configuration ? configuration.getUniforms(context) : [];
 
         if (this.forceManualRenderingForInstanceIDShaders) {
@@ -199,7 +197,7 @@ class Program<Us extends UniformBindings> {
 
         // Symbol and circle layer are depth (terrain + 3d layers) occluded
         // For the sake of native compatibility depth occlusion goes via terrain uniforms block
-        if (fixedDefines.includes('TERRAIN') || name.indexOf("symbol") !== -1 || name.indexOf("circle") !== -1) {
+        if (fixedDefines.includes('TERRAIN') || name.includes('symbol') || name.includes('circle')) {
             this.terrainUniforms = terrainUniforms(context);
         }
         if (fixedDefines.includes('GLOBE')) {
@@ -363,17 +361,13 @@ class Program<Us extends UniformBindings> {
             return;
         }
 
-        const debugDefines: DynamicDefinesType[] = [...this.fixedDefines];
-        debugDefines.push('DEBUG_WIREFRAME');
+        const debugDefines: DynamicDefinesType[] = [...this.fixedDefines, 'DEBUG_WIREFRAME'];
         const debugProgram = painter.getOrCreateProgram(this.name, {config: this.configuration, defines: debugDefines});
 
         context.program.set(debugProgram.program);
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const copyUniformValues = (group: string, pSrc: any, pDst: any) => {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        const copyUniformValues = (group: string, pSrc: Program<Us>, pDst: Program<UniformBindings>) => {
             if (pSrc[group] && pDst[group]) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 for (const name in pSrc[group]) {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                     if (pDst[group][name]) {
@@ -488,8 +482,8 @@ class Program<Us extends UniformBindings> {
         context.setColorMode(colorMode);
         context.setCullFace(cullFaceMode);
 
-        for (const name of Object.keys(this.fixedUniforms)) {
-            this.fixedUniforms[name].set(this.program, name, uniformValues[name]);
+        for (const [name, uniform] of this.fixedUniformsEntries) {
+            uniform.set(this.program, name, uniformValues[name]);
         }
 
         if (configuration) {
@@ -505,6 +499,10 @@ class Program<Us extends UniformBindings> {
 
         this.checkUniforms(layerID, 'RENDER_SHADOWS', this.shadowUniforms);
 
+        const dynamicBuffers = dynamicLayoutBuffers || [];
+        const paintVertexBuffers = configuration ? configuration.getPaintVertexBuffers() : [];
+        const shouldDrawWireframe = drawMode === gl.TRIANGLES && indexBuffer;
+
         const vertexAttribDivisorValue = instanceCount && instanceCount > 0 ? 1 : undefined;
         for (const segment of segments.get()) {
             const vaos = segment.vaos || (segment.vaos = {});
@@ -513,10 +511,10 @@ class Program<Us extends UniformBindings> {
                 context,
                 this,
                 layoutVertexBuffer,
-                configuration ? configuration.getPaintVertexBuffers() : [],
+                paintVertexBuffers,
                 indexBuffer,
                 segment.vertexOffset,
-                dynamicLayoutBuffers ? dynamicLayoutBuffers : [],
+                dynamicBuffers,
                 vertexAttribDivisorValue
             );
 
@@ -555,8 +553,7 @@ class Program<Us extends UniformBindings> {
                     gl.drawArrays(drawMode, segment.vertexOffset, segment.vertexLength);
                 }
             }
-            if (drawMode === gl.TRIANGLES && indexBuffer) {
-                // Handle potential wireframe rendering for current draw call
+            if (shouldDrawWireframe) {
                 this._drawDebugWireframe(painter, depthMode, stencilMode, colorMode, indexBuffer, segment,
                     currentProperties, zoom, configuration, instanceCount);
             }

src/render/uniform_binding.ts

@@ -210,4 +210,4 @@ export {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type UniformBindings = Record<string, IUniform<any>>;
+export type UniformBindings = Record<PropertyKey, IUniform<any>>;