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

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");