@luma.gl/webgl 9.0.0-alpha.50 → 9.0.0-alpha.51

package/dist/adapter/resources/webgl-shader.d.ts

@@ -8,7 +8,8 @@ export declare class WEBGLShader extends Shader {
     readonly handle: WebGLShader;
     constructor(device: WebGLDevice, props: ShaderProps);
     destroy(): void;
-    compilationInfo(): Promise<readonly CompilerMessage[]>;
+    getCompilationInfo(): Promise<readonly CompilerMessage[]>;
+    getCompilationInfoSync(): readonly CompilerMessage[];
     _compile(source: string): void;
 }
 //# sourceMappingURL=webgl-shader.d.ts.map

package/dist/adapter/resources/webgl-shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-shader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,MAAM,EAAE,WAAW,EAAE,eAAe,EAAoB,MAAM,eAAe,CAAC;AAIhG,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;IAgB1C,OAAO,IAAI,IAAI;IASlB,eAAe,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAO5D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAuB/B"}
+{"version":3,"file":"webgl-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-shader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAGnE,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;IAgB1C,OAAO,IAAI,IAAI;IAST,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAI/D,sBAAsB;IAO/B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAqB/B"}

package/dist/adapter/resources/webgl-shader.js

@@ -1,12 +1,8 @@
-import { log, uid, Shader, formatCompilerLog } from '@luma.gl/core';
-import { getShaderInfo } from "../helpers/get-shader-info.js";
+import { Shader } from '@luma.gl/core';
 import { parseShaderCompilerLog } from "../helpers/parse-shader-compiler-log.js";
 export class WEBGLShader extends Shader {
   constructor(device, props) {
-    super(device, {
-      id: getShaderIdFromProps(props),
-      ...props
-    });
+    super(device, props);
     this.device = void 0;
     this.handle = void 0;
     this.device = device;
@@ -29,9 +25,12 @@ export class WEBGLShader extends Shader {
       this.destroyed = true;
     }
   }
-  async compilationInfo() {
+  async getCompilationInfo() {
+    return this.getCompilationInfoSync();
+  }
+  getCompilationInfoSync() {
     const log = this.device.gl.getShaderInfoLog(this.handle);
-    return log ? parseShaderCompilerLog(log) : [];
+    return parseShaderCompilerLog(log);
   }
   _compile(source) {
     const addGLSLVersion = source => source.startsWith('#version ') ? source : `#version 100\n${source}`;
@@ -41,22 +40,11 @@ export class WEBGLShader extends Shader {
     } = this.device;
     gl.shaderSource(this.handle, source);
     gl.compileShader(this.handle);
-    const compileStatus = gl.getShaderParameter(this.handle, 35713);
-    if (!compileStatus) {
-      const shaderLog = gl.getShaderInfoLog(this.handle);
-      const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];
-      const messages = parsedLog.filter(message => message.type === 'error');
-      const formattedLog = formatCompilerLog(messages, source, {
-        showSourceCode: true
-      });
-      const shaderName = getShaderInfo(source).name;
-      const shaderDescription = `${this.stage} shader ${shaderName}`;
-      log.error(`GLSL compilation errors in ${shaderDescription}\n${formattedLog}`)();
-      throw new Error(`GLSL compilation errors in ${shaderName}`);
+    this.compilationStatus = gl.getShaderParameter(this.handle, 35713) ? 'success' : 'error';
+    this.debugShader();
+    if (this.compilationStatus === 'error') {
+      throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);
     }
   }
 }
-function getShaderIdFromProps(props) {
-  return getShaderInfo(props.source).name || props.id || uid(`unnamed ${props.stage}-shader`);
-}
 //# sourceMappingURL=webgl-shader.js.map

package/dist/adapter/resources/webgl-shader.js.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-shader.js","names":["log","uid","Shader","formatCompilerLog","getShaderInfo","parseShaderCompilerLog","WEBGLShader","constructor","device","props","id","getShaderIdFromProps","handle","stage","gl","createShader","Error","_compile","source","destroy","removeStats","deleteShader","destroyed","compilationInfo","getShaderInfoLog","addGLSLVersion","startsWith","shaderSource","compileShader","compileStatus","getShaderParameter","shaderLog","parsedLog","messages","filter","message","type","formattedLog","showSourceCode","shaderName","name","shaderDescription","error"],"sources":["../../../src/adapter/resources/webgl-shader.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {log, uid, Shader, ShaderProps, CompilerMessage, formatCompilerLog} from '@luma.gl/core';\nimport {GL} from '@luma.gl/constants';\nimport {getShaderInfo} from '../helpers/get-shader-info';\nimport {parseShaderCompilerLog} from '../helpers/parse-shader-compiler-log';\nimport {WebGLDevice} from '../webgl-device';\n\n/**\n * An immutable compiled shader program that execute portions of the GPU Pipeline\n */\nexport class WEBGLShader extends Shader {\n  readonly device: WebGLDevice;\n  readonly handle: WebGLShader;\n\n  constructor(device: WebGLDevice, props: ShaderProps) {\n    super(device, {id: getShaderIdFromProps(props), ...props});\n    this.device = device;\n    switch (this.props.stage) {\n      case 'vertex':\n        this.handle = this.props.handle || this.device.gl.createShader(GL.VERTEX_SHADER);\n        break;\n      case 'fragment':\n        this.handle = this.props.handle || this.device.gl.createShader(GL.FRAGMENT_SHADER);\n        break;\n      default:\n        throw new Error(this.props.stage);\n    }\n    this._compile(this.source);\n  }\n\n  override destroy(): void {\n    if (this.handle) {\n      this.removeStats();\n      this.device.gl.deleteShader(this.handle);\n      // this.handle = null;\n      this.destroyed = true;\n    }\n  }\n\n  async compilationInfo(): Promise<readonly CompilerMessage[]> {\n    const log = this.device.gl.getShaderInfoLog(this.handle);\n    return log ? parseShaderCompilerLog(log) : [];\n  }\n\n  // PRIVATE METHODS\n\n  _compile(source: string): void {\n    const addGLSLVersion = (source: string) => source.startsWith('#version ') ? source : `#version 100\\n${source}`;\n    source = addGLSLVersion(source);\n\n    const {gl} = this.device;\n    gl.shaderSource(this.handle, source);\n    gl.compileShader(this.handle);\n\n    // TODO - For performance reasons, avoid checking shader compilation errors on production?\n    // TODO - Load log even when no error reported, to catch warnings?\n    // https://gamedev.stackexchange.com/questions/30429/how-to-detect-glsl-warnings\n    const compileStatus = gl.getShaderParameter(this.handle, GL.COMPILE_STATUS);\n    if (!compileStatus) {\n      const shaderLog = gl.getShaderInfoLog(this.handle);\n      const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];\n      const messages = parsedLog.filter(message => message.type === 'error');\n      const formattedLog = formatCompilerLog(messages, source, {showSourceCode: true});\n      const shaderName: string = getShaderInfo(source).name;\n      const shaderDescription = `${this.stage} shader ${shaderName}`;\n      log.error(`GLSL compilation errors in ${shaderDescription}\\n${formattedLog}`)();\n      throw new Error(`GLSL compilation errors in ${shaderName}`);\n    }\n  }\n}\n\n// HELPERS\n\n/** Deduce an id, from shader source, or supplied id, or shader type */\nfunction getShaderIdFromProps(props: ShaderProps): string {\n  return getShaderInfo(props.source).name ||\n    props.id ||\n    uid(`unnamed ${props.stage}-shader`);\n}\n"],"mappings":"AAGA,SAAQA,GAAG,EAAEC,GAAG,EAAEC,MAAM,EAAgCC,iBAAiB,QAAO,eAAe;AAAC,SAExFC,aAAa;AAAA,SACbC,sBAAsB;AAM9B,OAAO,MAAMC,WAAW,SAASJ,MAAM,CAAC;EAItCK,WAAWA,CAACC,MAAmB,EAAEC,KAAkB,EAAE;IACnD,KAAK,CAACD,MAAM,EAAE;MAACE,EAAE,EAAEC,oBAAoB,CAACF,KAAK,CAAC;MAAE,GAAGA;IAAK,CAAC,CAAC;IAAC,KAJpDD,MAAM;IAAA,KACNI,MAAM;IAIb,IAAI,CAACJ,MAAM,GAAGA,MAAM;IACpB,QAAQ,IAAI,CAACC,KAAK,CAACI,KAAK;MACtB,KAAK,QAAQ;QACX,IAAI,CAACD,MAAM,GAAG,IAAI,CAACH,KAAK,CAACG,MAAM,IAAI,IAAI,CAACJ,MAAM,CAACM,EAAE,CAACC,YAAY,MAAiB,CAAC;QAChF;MACF,KAAK,UAAU;QACb,IAAI,CAACH,MAAM,GAAG,IAAI,CAACH,KAAK,CAACG,MAAM,IAAI,IAAI,CAACJ,MAAM,CAACM,EAAE,CAACC,YAAY,MAAmB,CAAC;QAClF;MACF;QACE,MAAM,IAAIC,KAAK,CAAC,IAAI,CAACP,KAAK,CAACI,KAAK,CAAC;IACrC;IACA,IAAI,CAACI,QAAQ,CAAC,IAAI,CAACC,MAAM,CAAC;EAC5B;EAESC,OAAOA,CAAA,EAAS;IACvB,IAAI,IAAI,CAACP,MAAM,EAAE;MACf,IAAI,CAACQ,WAAW,CAAC,CAAC;MAClB,IAAI,CAACZ,MAAM,CAACM,EAAE,CAACO,YAAY,CAAC,IAAI,CAACT,MAAM,CAAC;MAExC,IAAI,CAACU,SAAS,GAAG,IAAI;IACvB;EACF;EAEA,MAAMC,eAAeA,CAAA,EAAwC;IAC3D,MAAMvB,GAAG,GAAG,IAAI,CAACQ,MAAM,CAACM,EAAE,CAACU,gBAAgB,CAAC,IAAI,CAACZ,MAAM,CAAC;IACxD,OAAOZ,GAAG,GAAGK,sBAAsB,CAACL,GAAG,CAAC,GAAG,EAAE;EAC/C;EAIAiB,QAAQA,CAACC,MAAc,EAAQ;IAC7B,MAAMO,cAAc,GAAIP,MAAc,IAAKA,MAAM,CAACQ,UAAU,CAAC,WAAW,CAAC,GAAGR,MAAM,GAAI,iBAAgBA,MAAO,EAAC;IAC9GA,MAAM,GAAGO,cAAc,CAACP,MAAM,CAAC;IAE/B,MAAM;MAACJ;IAAE,CAAC,GAAG,IAAI,CAACN,MAAM;IACxBM,EAAE,CAACa,YAAY,CAAC,IAAI,CAACf,MAAM,EAAEM,MAAM,CAAC;IACpCJ,EAAE,CAACc,aAAa,CAAC,IAAI,CAAChB,MAAM,CAAC;IAK7B,MAAMiB,aAAa,GAAGf,EAAE,CAACgB,kBAAkB,CAAC,IAAI,CAAClB,MAAM,OAAmB,CAAC;IAC3E,IAAI,CAACiB,aAAa,EAAE;MAClB,MAAME,SAAS,GAAGjB,EAAE,CAACU,gBAAgB,CAAC,IAAI,CAACZ,MAAM,CAAC;MAClD,MAAMoB,SAAS,GAAGD,SAAS,GAAG1B,sBAAsB,CAAC0B,SAAS,CAAC,GAAG,EAAE;MACpE,MAAME,QAAQ,GAAGD,SAAS,CAACE,MAAM,CAACC,OAAO,IAAIA,OAAO,CAACC,IAAI,KAAK,OAAO,CAAC;MACtE,MAAMC,YAAY,GAAGlC,iBAAiB,CAAC8B,QAAQ,EAAEf,MAAM,EAAE;QAACoB,cAAc,EAAE;MAAI,CAAC,CAAC;MAChF,MAAMC,UAAkB,GAAGnC,aAAa,CAACc,MAAM,CAAC,CAACsB,IAAI;MACrD,MAAMC,iBAAiB,GAAI,GAAE,IAAI,CAAC5B,KAAM,WAAU0B,UAAW,EAAC;MAC9DvC,GAAG,CAAC0C,KAAK,CAAE,8BAA6BD,iBAAkB,KAAIJ,YAAa,EAAC,CAAC,CAAC,CAAC;MAC/E,MAAM,IAAIrB,KAAK,CAAE,8BAA6BuB,UAAW,EAAC,CAAC;IAC7D;EACF;AACF;AAKA,SAAS5B,oBAAoBA,CAACF,KAAkB,EAAU;EACxD,OAAOL,aAAa,CAACK,KAAK,CAACS,MAAM,CAAC,CAACsB,IAAI,IACrC/B,KAAK,CAACC,EAAE,IACRT,GAAG,CAAE,WAAUQ,KAAK,CAACI,KAAM,SAAQ,CAAC;AACxC"}
+{"version":3,"file":"webgl-shader.js","names":["Shader","parseShaderCompilerLog","WEBGLShader","constructor","device","props","handle","stage","gl","createShader","Error","_compile","source","destroy","removeStats","deleteShader","destroyed","getCompilationInfo","getCompilationInfoSync","log","getShaderInfoLog","addGLSLVersion","startsWith","shaderSource","compileShader","compilationStatus","getShaderParameter","debugShader","id"],"sources":["../../../src/adapter/resources/webgl-shader.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {Shader, ShaderProps, CompilerMessage} from '@luma.gl/core';\nimport {GL} from '@luma.gl/constants';\nimport {parseShaderCompilerLog} from '../helpers/parse-shader-compiler-log';\nimport {WebGLDevice} from '../webgl-device';\n\n/**\n * An immutable compiled shader program that execute portions of the GPU Pipeline\n */\nexport class WEBGLShader extends Shader {\n  readonly device: WebGLDevice;\n  readonly handle: WebGLShader;\n\n  constructor(device: WebGLDevice, props: ShaderProps) {\n    super(device, props);\n    this.device = device;\n    switch (this.props.stage) {\n      case 'vertex':\n        this.handle = this.props.handle || this.device.gl.createShader(GL.VERTEX_SHADER);\n        break;\n      case 'fragment':\n        this.handle = this.props.handle || this.device.gl.createShader(GL.FRAGMENT_SHADER);\n        break;\n      default:\n        throw new Error(this.props.stage);\n    }\n    this._compile(this.source);\n  }\n\n  override destroy(): void {\n    if (this.handle) {\n      this.removeStats();\n      this.device.gl.deleteShader(this.handle);\n      // this.handle = null;\n      this.destroyed = true;\n    }\n  }\n\n  override async getCompilationInfo(): Promise<readonly CompilerMessage[]> {\n    return this.getCompilationInfoSync();\n  }\n\n  override getCompilationInfoSync() {\n    const log = this.device.gl.getShaderInfoLog(this.handle);\n    return parseShaderCompilerLog(log);\n  }\n\n  // PRIVATE METHODS\n\n  _compile(source: string): void {\n    const addGLSLVersion = (source: string) =>\n      source.startsWith('#version ') ? source : `#version 100\\n${source}`;\n    source = addGLSLVersion(source);\n\n    const {gl} = this.device;\n    gl.shaderSource(this.handle, source);\n    gl.compileShader(this.handle);\n\n    // TODO - For performance reasons, avoid checking shader compilation errors on production?\n    // TODO - Load log even when no error reported, to catch warnings?\n    // https://gamedev.stackexchange.com/questions/30429/how-to-detect-glsl-warnings\n    this.compilationStatus = gl.getShaderParameter(this.handle, GL.COMPILE_STATUS) ? 'success' : 'error';\n\n    // The `Shader` base class will determine if debug window should be opened based on props\n    this.debugShader();\n\n    if (this.compilationStatus === 'error') {\n      throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);\n    }\n  }\n}\n\n// TODO - Original code from luma.gl v8 - keep until new debug functionality has matured\n// if (!compilationSuccess) {\n//   const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];\n//   const messages = parsedLog.filter(message => message.type === 'error');\n//   const formattedLog = formatCompilerLog(messages, source, {showSourceCode: 'all', html: true});\n//   const shaderDescription = `${this.stage} shader ${shaderName}`;\n//   log.error(`GLSL compilation errors in ${shaderDescription}\\n${formattedLog}`)();\n//   displayShaderLog(parsedLog, source, shaderName);\n// }\n\n"],"mappings":"AAGA,SAAQA,MAAM,QAAqC,eAAe;AAAC,SAE3DC,sBAAsB;AAM9B,OAAO,MAAMC,WAAW,SAASF,MAAM,CAAC;EAItCG,WAAWA,CAACC,MAAmB,EAAEC,KAAkB,EAAE;IACnD,KAAK,CAACD,MAAM,EAAEC,KAAK,CAAC;IAAC,KAJdD,MAAM;IAAA,KACNE,MAAM;IAIb,IAAI,CAACF,MAAM,GAAGA,MAAM;IACpB,QAAQ,IAAI,CAACC,KAAK,CAACE,KAAK;MACtB,KAAK,QAAQ;QACX,IAAI,CAACD,MAAM,GAAG,IAAI,CAACD,KAAK,CAACC,MAAM,IAAI,IAAI,CAACF,MAAM,CAACI,EAAE,CAACC,YAAY,MAAiB,CAAC;QAChF;MACF,KAAK,UAAU;QACb,IAAI,CAACH,MAAM,GAAG,IAAI,CAACD,KAAK,CAACC,MAAM,IAAI,IAAI,CAACF,MAAM,CAACI,EAAE,CAACC,YAAY,MAAmB,CAAC;QAClF;MACF;QACE,MAAM,IAAIC,KAAK,CAAC,IAAI,CAACL,KAAK,CAACE,KAAK,CAAC;IACrC;IACA,IAAI,CAACI,QAAQ,CAAC,IAAI,CAACC,MAAM,CAAC;EAC5B;EAESC,OAAOA,CAAA,EAAS;IACvB,IAAI,IAAI,CAACP,MAAM,EAAE;MACf,IAAI,CAACQ,WAAW,CAAC,CAAC;MAClB,IAAI,CAACV,MAAM,CAACI,EAAE,CAACO,YAAY,CAAC,IAAI,CAACT,MAAM,CAAC;MAExC,IAAI,CAACU,SAAS,GAAG,IAAI;IACvB;EACF;EAEA,MAAeC,kBAAkBA,CAAA,EAAwC;IACvE,OAAO,IAAI,CAACC,sBAAsB,CAAC,CAAC;EACtC;EAESA,sBAAsBA,CAAA,EAAG;IAChC,MAAMC,GAAG,GAAG,IAAI,CAACf,MAAM,CAACI,EAAE,CAACY,gBAAgB,CAAC,IAAI,CAACd,MAAM,CAAC;IACxD,OAAOL,sBAAsB,CAACkB,GAAG,CAAC;EACpC;EAIAR,QAAQA,CAACC,MAAc,EAAQ;IAC7B,MAAMS,cAAc,GAAIT,MAAc,IACpCA,MAAM,CAACU,UAAU,CAAC,WAAW,CAAC,GAAGV,MAAM,GAAI,iBAAgBA,MAAO,EAAC;IACrEA,MAAM,GAAGS,cAAc,CAACT,MAAM,CAAC;IAE/B,MAAM;MAACJ;IAAE,CAAC,GAAG,IAAI,CAACJ,MAAM;IACxBI,EAAE,CAACe,YAAY,CAAC,IAAI,CAACjB,MAAM,EAAEM,MAAM,CAAC;IACpCJ,EAAE,CAACgB,aAAa,CAAC,IAAI,CAAClB,MAAM,CAAC;IAK7B,IAAI,CAACmB,iBAAiB,GAAGjB,EAAE,CAACkB,kBAAkB,CAAC,IAAI,CAACpB,MAAM,OAAmB,CAAC,GAAG,SAAS,GAAG,OAAO;IAGpG,IAAI,CAACqB,WAAW,CAAC,CAAC;IAElB,IAAI,IAAI,CAACF,iBAAiB,KAAK,OAAO,EAAE;MACtC,MAAM,IAAIf,KAAK,CAAE,8BAA6B,IAAI,CAACL,KAAK,CAACE,KAAM,WAAU,IAAI,CAACF,KAAK,CAACuB,EAAG,EAAC,CAAC;IAC3F;EACF;AACF"}

package/dist/dist.dev.js

@@ -1433,26 +1433,172 @@ var __exports__ = (() => {
   __publicField(Texture, "STORAGE_BINDING", 8);
   __publicField(Texture, "RENDER_ATTACHMENT", 16);
 
+  // ../core/src/lib/compiler-log/format-compiler-log.ts
+  function formatCompilerLog(shaderLog, source, options) {
+    let formattedLog = "";
+    const lines = source.split(/\r?\n/);
+    const log3 = shaderLog.slice().sort((a, b) => a.lineNum - b.lineNum);
+    switch (options?.showSourceCode || "no") {
+      case "all":
+        let currentMessage = 0;
+        for (let lineNum = 1; lineNum <= lines.length; lineNum++) {
+          formattedLog += getNumberedLine(lines[lineNum - 1], lineNum, options);
+          while (log3.length > currentMessage && log3[currentMessage].lineNum === lineNum) {
+            const message2 = log3[currentMessage++];
+            formattedLog += formatCompilerMessage(message2, lines, message2.lineNum, {
+              ...options,
+              inlineSource: false
+            });
+          }
+        }
+        return formattedLog;
+      case "issues":
+      case "no":
+        for (const message2 of shaderLog) {
+          formattedLog += formatCompilerMessage(message2, lines, message2.lineNum, {
+            inlineSource: options?.showSourceCode !== "no"
+          });
+        }
+        return formattedLog;
+    }
+  }
+  function formatCompilerMessage(message2, lines, lineNum, options) {
+    if (options?.inlineSource) {
+      const numberedLines = getNumberedLines(lines, lineNum);
+      const positionIndicator = message2.linePos > 0 ? `${" ".repeat(message2.linePos + 5)}^^^
+` : "";
+      return `
+${numberedLines}${positionIndicator}${message2.type.toUpperCase()}: ${message2.message}
+
+`;
+    }
+    return options?.html ? `<div class='luma-compiler-log-error' style="color:red;"><b> ${message2.type.toUpperCase()}: ${message2.message}</b></div>` : `${message2.type.toUpperCase()}: ${message2.message}`;
+  }
+  function getNumberedLines(lines, lineNum, options) {
+    let numberedLines = "";
+    for (let lineIndex = lineNum - 2; lineIndex <= lineNum; lineIndex++) {
+      const sourceLine = lines[lineIndex - 1];
+      if (sourceLine !== void 0) {
+        numberedLines += getNumberedLine(sourceLine, lineNum, options);
+      }
+    }
+    return numberedLines;
+  }
+  function getNumberedLine(line, lineNum, options) {
+    return `${padLeft(String(lineNum), 4)}: ${line}${options?.html ? "<br/>" : "\n"}`;
+  }
+  function padLeft(string, paddedLength) {
+    let result = "";
+    for (let i = string.length; i < paddedLength; ++i) {
+      result += " ";
+    }
+    return result + string;
+  }
+
+  // ../core/src/lib/compiler-log/get-shader-info.ts
+  function getShaderInfo(source, defaultName) {
+    return {
+      name: getShaderName(source, defaultName),
+      language: "glsl",
+      version: getShaderVersion(source)
+    };
+  }
+  function getShaderName(shader, defaultName = "unnamed") {
+    const SHADER_NAME_REGEXP = /#define[\s*]SHADER_NAME[\s*]([A-Za-z0-9_-]+)[\s*]/;
+    const match = SHADER_NAME_REGEXP.exec(shader);
+    return match ? match[1] : defaultName;
+  }
+  function getShaderVersion(source) {
+    let version = 100;
+    const words = source.match(/[^\s]+/g);
+    if (words && words.length >= 2 && words[0] === "#version") {
+      const v = parseInt(words[1], 10);
+      if (Number.isFinite(v)) {
+        version = v;
+      }
+    }
+    return version;
+  }
+
   // ../core/src/adapter/resources/shader.ts
   var _Shader = class extends Resource {
     get [Symbol.toStringTag]() {
       return "Shader";
     }
+    compilationStatus = "pending";
     constructor(device, props) {
-      super(device, props, _Shader.defaultProps);
+      super(device, {
+        id: getShaderIdFromProps(props),
+        ...props
+      }, _Shader.defaultProps);
       this.stage = this.props.stage;
       this.source = this.props.source;
     }
+    getCompilationInfoSync() {
+      return null;
+    }
+    async debugShader() {
+      switch (this.props.debug) {
+        case "never":
+          return;
+        case "errors":
+          if (this.compilationStatus === "success") {
+            return;
+          }
+          break;
+        case "warnings":
+        case "always":
+          break;
+      }
+      const messages = await this.getCompilationInfo();
+      if (this.props.debug === "warnings" && messages?.length === 0) {
+        return;
+      }
+      this._displayShaderLog(messages);
+    }
+    _displayShaderLog(messages) {
+      if (typeof document === "undefined" || !document?.createElement) {
+        return;
+      }
+      const shaderName = getShaderInfo(this.source).name;
+      const shaderTitle = `${this.stage} ${shaderName}`;
+      const htmlLog = formatCompilerLog(messages, this.source, {
+        showSourceCode: "all",
+        html: true
+      });
+      const button = document.createElement("Button");
+      button.innerHTML = `
+<h1>Shader Compilation Error in ${shaderTitle}</h1><br /><br />
+<code style="user-select:text;"><pre>
+${htmlLog}
+</pre></code>`;
+      button.style.top = "10px";
+      button.style.left = "10px";
+      button.style.position = "absolute";
+      button.style.zIndex = "9999";
+      button.style.width = "100%";
+      button.style.textAlign = "left";
+      document.body.appendChild(button);
+      document.getElementsByClassName("luma-compiler-log-error")[0]?.scrollIntoView();
+      button.onclick = () => {
+        const dataURI = `data:text/plain,${encodeURIComponent(this.source)}`;
+        navigator.clipboard.writeText(dataURI);
+      };
+    }
   };
   var Shader = _Shader;
   __publicField(Shader, "defaultProps", {
     ...Resource.defaultProps,
+    language: "auto",
     stage: "vertex",
     source: "",
     sourceMap: null,
-    language: "auto",
-    shaderType: 0
+    entryPoint: "main",
+    debug: "errors"
   });
+  function getShaderIdFromProps(props) {
+    return getShaderInfo(props.source).name || props.id || uid(`unnamed ${props.stage}-shader`);
+  }
 
   // ../core/src/adapter/resources/sampler.ts
   var _Sampler = class extends Resource {
@@ -2098,46 +2244,6 @@ var __exports__ = (() => {
     };
   }
 
-  // ../core/src/lib/compiler-log/format-compiler-log.ts
-  function formatCompilerLog(shaderLog, source, options) {
-    const lines = source.split(/\r?\n/);
-    let formattedLog = "";
-    for (const message2 of shaderLog) {
-      formattedLog += formatCompilerMessage(message2, lines, message2.lineNum, options);
-    }
-    return formattedLog;
-  }
-  function formatCompilerMessage(message2, lines, lineNum, options) {
-    if (options?.showSourceCode) {
-      const positionIndicator = message2.linePos > 0 ? `${" ".repeat(message2.linePos + 5)}^^^
-` : "";
-      const numberedLines = getNumberedLines(lines, lineNum);
-      return `${numberedLines}${positionIndicator}${message2.type.toUpperCase()}: ${message2.message}
-
-`;
-    }
-    return `${message2.type.toUpperCase()}: ${message2.message}
-`;
-  }
-  function getNumberedLines(lines, lineNum) {
-    let numberedLines = "";
-    for (let line = lineNum - 2; line <= lineNum; line++) {
-      const sourceLine = lines[line];
-      if (sourceLine !== void 0) {
-        numberedLines += `${padLeft(String(line), 4)}: ${sourceLine}
-`;
-      }
-    }
-    return numberedLines;
-  }
-  function padLeft(string, paddedLength) {
-    let result = "";
-    for (let i = string.length; i < paddedLength; ++i) {
-      result += " ";
-    }
-    return result + string;
-  }
-
   // ../core/src/lib/utils/cast.ts
   function cast(value) {
     return value;
@@ -6406,31 +6512,6 @@ void main(void) {}`;
     }
   }
 
-  // src/adapter/helpers/get-shader-info.ts
-  function getShaderInfo(source, defaultName) {
-    return {
-      name: getShaderName(source, defaultName),
-      language: "glsl",
-      version: getShaderVersion(source)
-    };
-  }
-  function getShaderName(shader, defaultName = "unnamed") {
-    const SHADER_NAME_REGEXP = /#define[\s*]SHADER_NAME[\s*]([A-Za-z0-9_-]+)[\s*]/;
-    const match = SHADER_NAME_REGEXP.exec(shader);
-    return match ? match[1] : defaultName;
-  }
-  function getShaderVersion(source) {
-    let version = 100;
-    const words = source.match(/[^\s]+/g);
-    if (words && words.length >= 2 && words[0] === "#version") {
-      const v = parseInt(words[1], 10);
-      if (Number.isFinite(v)) {
-        version = v;
-      }
-    }
-    return version;
-  }
-
   // src/adapter/helpers/parse-shader-compiler-log.ts
   function parseShaderCompilerLog(errLog) {
     const lines = errLog.split(/\r?\n/);
@@ -6477,10 +6558,7 @@ void main(void) {}`;
   // src/adapter/resources/webgl-shader.ts
   var WEBGLShader = class extends Shader {
     constructor(device, props) {
-      super(device, {
-        id: getShaderIdFromProps(props),
-        ...props
-      });
+      super(device, props);
       this.device = device;
       switch (this.props.stage) {
         case "vertex":
@@ -6501,9 +6579,12 @@ void main(void) {}`;
         this.destroyed = true;
       }
     }
-    async compilationInfo() {
+    async getCompilationInfo() {
+      return this.getCompilationInfoSync();
+    }
+    getCompilationInfoSync() {
       const log3 = this.device.gl.getShaderInfoLog(this.handle);
-      return log3 ? parseShaderCompilerLog(log3) : [];
+      return parseShaderCompilerLog(log3);
     }
     _compile(source) {
       const addGLSLVersion = (source2) => source2.startsWith("#version ") ? source2 : `#version 100
@@ -6514,25 +6595,13 @@ ${source2}`;
       } = this.device;
       gl.shaderSource(this.handle, source);
       gl.compileShader(this.handle);
-      const compileStatus = gl.getShaderParameter(this.handle, 35713);
-      if (!compileStatus) {
-        const shaderLog = gl.getShaderInfoLog(this.handle);
-        const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];
-        const messages = parsedLog.filter((message2) => message2.type === "error");
-        const formattedLog = formatCompilerLog(messages, source, {
-          showSourceCode: true
-        });
-        const shaderName = getShaderInfo(source).name;
-        const shaderDescription = `${this.stage} shader ${shaderName}`;
-        log.error(`GLSL compilation errors in ${shaderDescription}
-${formattedLog}`)();
-        throw new Error(`GLSL compilation errors in ${shaderName}`);
+      this.compilationStatus = gl.getShaderParameter(this.handle, 35713) ? "success" : "error";
+      this.debugShader();
+      if (this.compilationStatus === "error") {
+        throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);
       }
     }
   };
-  function getShaderIdFromProps(props) {
-    return getShaderInfo(props.source).name || props.id || uid(`unnamed ${props.stage}-shader`);
-  }
 
   // src/adapter/resources/webgl-render-pass.ts
   var GL_DEPTH_BUFFER_BIT = 256;

package/dist/index.cjs

@@ -1331,13 +1331,13 @@ var GLState = class {
   constructor(gl, {
     copyState = false,
     // Copy cache from params (slow) or initialize from WebGL defaults (fast)
-    log: log10 = () => {
+    log: log9 = () => {
     }
     // Logging function, called when gl parameter change calls are actually issued
   } = {}) {
     this.gl = gl;
     this.cache = copyState ? getGLParameters(gl) : Object.assign({}, GL_PARAMETER_DEFAULTS);
-    this.log = log10;
+    this.log = log9;
     this._updateCache = this._updateCache.bind(this);
     Object.seal(this);
   }
@@ -4155,31 +4155,6 @@ function onValidateGLFunc(props, functionName, functionArgs) {
 var import_core18 = require("@luma.gl/core");
 var import_constants16 = require("@luma.gl/constants");
 
-// src/adapter/helpers/get-shader-info.ts
-function getShaderInfo(source, defaultName) {
-  return {
-    name: getShaderName(source, defaultName),
-    language: "glsl",
-    version: getShaderVersion(source)
-  };
-}
-function getShaderName(shader, defaultName = "unnamed") {
-  const SHADER_NAME_REGEXP = /#define[\s*]SHADER_NAME[\s*]([A-Za-z0-9_-]+)[\s*]/;
-  const match = SHADER_NAME_REGEXP.exec(shader);
-  return match ? match[1] : defaultName;
-}
-function getShaderVersion(source) {
-  let version = 100;
-  const words = source.match(/[^\s]+/g);
-  if (words && words.length >= 2 && words[0] === "#version") {
-    const v = parseInt(words[1], 10);
-    if (Number.isFinite(v)) {
-      version = v;
-    }
-  }
-  return version;
-}
-
 // src/adapter/helpers/parse-shader-compiler-log.ts
 function parseShaderCompilerLog(errLog) {
   const lines = errLog.split(/\r?\n/);
@@ -4229,7 +4204,7 @@ var WEBGLShader = class extends import_core18.Shader {
   device;
   handle;
   constructor(device, props) {
-    super(device, { id: getShaderIdFromProps(props), ...props });
+    super(device, props);
     this.device = device;
     switch (this.props.stage) {
       case "vertex":
@@ -4250,9 +4225,12 @@ var WEBGLShader = class extends import_core18.Shader {
       this.destroyed = true;
     }
   }
-  async compilationInfo() {
-    const log10 = this.device.gl.getShaderInfoLog(this.handle);
-    return log10 ? parseShaderCompilerLog(log10) : [];
+  async getCompilationInfo() {
+    return this.getCompilationInfoSync();
+  }
+  getCompilationInfoSync() {
+    const log9 = this.device.gl.getShaderInfoLog(this.handle);
+    return parseShaderCompilerLog(log9);
   }
   // PRIVATE METHODS
   _compile(source) {
@@ -4262,23 +4240,13 @@ ${source2}`;
     const { gl } = this.device;
     gl.shaderSource(this.handle, source);
     gl.compileShader(this.handle);
-    const compileStatus = gl.getShaderParameter(this.handle, import_constants16.GL.COMPILE_STATUS);
-    if (!compileStatus) {
-      const shaderLog = gl.getShaderInfoLog(this.handle);
-      const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];
-      const messages = parsedLog.filter((message2) => message2.type === "error");
-      const formattedLog = (0, import_core18.formatCompilerLog)(messages, source, { showSourceCode: true });
-      const shaderName = getShaderInfo(source).name;
-      const shaderDescription = `${this.stage} shader ${shaderName}`;
-      import_core18.log.error(`GLSL compilation errors in ${shaderDescription}
-${formattedLog}`)();
-      throw new Error(`GLSL compilation errors in ${shaderName}`);
+    this.compilationStatus = gl.getShaderParameter(this.handle, import_constants16.GL.COMPILE_STATUS) ? "success" : "error";
+    this.debugShader();
+    if (this.compilationStatus === "error") {
+      throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);
     }
   }
 };
-function getShaderIdFromProps(props) {
-  return getShaderInfo(props.source).name || props.id || (0, import_core18.uid)(`unnamed ${props.stage}-shader`);
-}
 
 // src/adapter/resources/webgl-render-pass.ts
 var import_core19 = require("@luma.gl/core");