@luma.gl/webgl 8.6.0-alpha.5 → 9.0.0-alpha.2

package/dist/es5/adapter/{webgl-shader.js → resources/webgl-shader.js}

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WEBGLShader = void 0;
+exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -31,7 +31,7 @@ var _constants = _interopRequireDefault(require("@luma.gl/constants"));
 
 var _shadertools = require("@luma.gl/shadertools");
 
-var _parseShaderCompilerLog = require("../webgl-utils/parse-shader-compiler-log");
+var _parseShaderCompilerLog = require("../helpers/parse-shader-compiler-log");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -54,29 +54,22 @@ var WEBGLShader = function (_Shader) {
       id: getShaderIdFromProps(props)
     }, props));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "device", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "gl", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handle", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "stage", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "source", void 0);
     _this.device = device;
-    _this.gl = device.gl;
 
     switch (_this.props.stage) {
       case 'vertex':
-        _this.handle = _this.props.handle || _this.gl.createShader(_constants.default.VERTEX_SHADER);
+        _this.handle = _this.props.handle || _this.device.gl.createShader(_constants.default.VERTEX_SHADER);
         break;
 
       case 'fragment':
-        _this.handle = _this.props.handle || _this.gl.createShader(_constants.default.FRAGMENT_SHADER);
+        _this.handle = _this.props.handle || _this.device.gl.createShader(_constants.default.FRAGMENT_SHADER);
         break;
 
       default:
         throw new Error(_this.props.stage);
     }
 
-    _this.stage = _this.props.stage;
-    _this.source = _this.props.source;
-
     _this._compile(_this.source);
 
     return _this;
@@ -87,7 +80,7 @@ var WEBGLShader = function (_Shader) {
     value: function destroy() {
       if (this.handle) {
         this.removeStats();
-        this.gl.deleteShader(this.handle);
+        this.device.gl.deleteShader(this.handle);
         this.handle = null;
       }
     }
@@ -100,7 +93,7 @@ var WEBGLShader = function (_Shader) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                log = this.gl.getShaderInfoLog(this.handle);
+                log = this.device.gl.getShaderInfoLog(this.handle);
                 return _context.abrupt("return", (0, _parseShaderCompilerLog.parseShaderCompilerLog)(log));
 
               case 2:
@@ -125,12 +118,13 @@ var WEBGLShader = function (_Shader) {
       };
 
       source = addGLSLVersion(source);
-      this.gl.shaderSource(this.handle, source);
-      this.gl.compileShader(this.handle);
-      var compileStatus = this.gl.getShaderParameter(this.handle, _constants.default.COMPILE_STATUS);
+      var gl = this.device.gl;
+      gl.shaderSource(this.handle, source);
+      gl.compileShader(this.handle);
+      var compileStatus = gl.getShaderParameter(this.handle, _constants.default.COMPILE_STATUS);
 
       if (!compileStatus) {
-        var shaderLog = this.gl.getShaderInfoLog(this.handle);
+        var shaderLog = gl.getShaderInfoLog(this.handle);
         var messages = (0, _parseShaderCompilerLog.parseShaderCompilerLog)(shaderLog).filter(function (message) {
           return message.type === 'error';
         });
@@ -147,7 +141,7 @@ var WEBGLShader = function (_Shader) {
   return WEBGLShader;
 }(_api.Shader);
 
-exports.WEBGLShader = WEBGLShader;
+exports.default = WEBGLShader;
 
 function getShaderIdFromProps(props) {
   return (0, _shadertools.getShaderInfo)(props.source).name || props.id || (0, _api.uid)("unnamed ".concat(props.stage, "-shader"));

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/adapter/resources/webgl-shader.ts"],"names":["WEBGLShader","device","props","id","getShaderIdFromProps","stage","handle","gl","createShader","GL","VERTEX_SHADER","FRAGMENT_SHADER","Error","_compile","source","removeStats","deleteShader","log","getShaderInfoLog","addGLSLVersion","startsWith","shaderSource","compileShader","compileStatus","getShaderParameter","COMPILE_STATUS","shaderLog","messages","filter","message","type","formattedLog","shaderName","name","shaderDescription","error","Shader"],"mappings":"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","sourcesContent":["// luma.gl, MIT license\nimport {log, uid, Shader, ShaderProps} from '@luma.gl/api';\nimport GL from '@luma.gl/constants';\nimport {getShaderInfo, CompilerMessage, formatCompilerLog} from '@luma.gl/shadertools';\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 */\n export default 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  destroy(): void {\n    if (this.handle) {\n      this.removeStats();\n      this.device.gl.deleteShader(this.handle);\n      // @ts-expect-error\n      this.handle = null;\n    }\n  }\n\n  async compilationInfo(): Promise<readonly CompilerMessage[]> {\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) => 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 messages = parseShaderCompilerLog(shaderLog).filter(message => message.type === 'error');\n      const formattedLog = formatCompilerLog(messages, source);\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"],"file":"webgl-shader.js"}