@luma.gl/webgl 8.6.0-alpha.4 → 9.0.0-alpha.10

package/dist/es5/adapter/resources/webgl-sampler.js

@@ -0,0 +1,96 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _api = require("@luma.gl/api");
+
+var _constants = _interopRequireDefault(require("@luma.gl/constants"));
+
+var _samplerParameters = require("../converters/sampler-parameters");
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+var WEBGLSampler = function (_Sampler) {
+  (0, _inherits2.default)(WEBGLSampler, _Sampler);
+
+  var _super = _createSuper(WEBGLSampler);
+
+  function WEBGLSampler(device, props) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, WEBGLSampler);
+    _this = _super.call(this, device, props);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "device", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handle", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "parameters", void 0);
+    _this.device = device;
+    _this.parameters = (0, _samplerParameters.convertSamplerParametersToWebGL)(props);
+
+    if (_this.device.isWebGL2) {
+      _this.handle = _this.handle || _this.device.gl2.createSampler();
+
+      _this._setSamplerParameters(_this.parameters);
+    }
+
+    return _this;
+  }
+
+  (0, _createClass2.default)(WEBGLSampler, [{
+    key: "destroy",
+    value: function destroy() {
+      if (this.handle) {
+        this.device.gl2.deleteSampler(this.handle);
+        this.handle = undefined;
+      }
+    }
+  }, {
+    key: "_setSamplerParameters",
+    value: function _setSamplerParameters(parameters) {
+      for (var _i = 0, _Object$entries = Object.entries(parameters); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
+            pname = _Object$entries$_i[0],
+            value = _Object$entries$_i[1];
+
+        var param = Number(pname);
+
+        switch (param) {
+          case _constants.default.TEXTURE_MIN_LOD:
+          case _constants.default.TEXTURE_MAX_LOD:
+            this.device.gl2.samplerParameterf(this.handle, param, value);
+            break;
+
+          default:
+            this.device.gl2.samplerParameteri(this.handle, param, value);
+            break;
+        }
+      }
+    }
+  }]);
+  return WEBGLSampler;
+}(_api.Sampler);
+
+exports.default = WEBGLSampler;
+//# sourceMappingURL=webgl-sampler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/adapter/resources/webgl-sampler.ts"],"names":["WEBGLSampler","device","props","parameters","isWebGL2","handle","gl2","createSampler","_setSamplerParameters","deleteSampler","undefined","Object","entries","pname","value","param","Number","GL","TEXTURE_MIN_LOD","TEXTURE_MAX_LOD","samplerParameterf","samplerParameteri","Sampler"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAEA;;AACA;;AAEA;;;;;;IAUqBA,Y;;;;;AAKnB,wBAAYC,MAAZ,EAAiCC,KAAjC,EAAsD;AAAA;;AAAA;AACpD,8BAAMD,MAAN,EAAcC,KAAd;AADoD;AAAA;AAAA;AAEpD,UAAKD,MAAL,GAAcA,MAAd;AACA,UAAKE,UAAL,GAAkB,wDAAgCD,KAAhC,CAAlB;;AACA,QAAI,MAAKD,MAAL,CAAYG,QAAhB,EAA0B;AACxB,YAAKC,MAAL,GAAc,MAAKA,MAAL,IAAe,MAAKJ,MAAL,CAAYK,GAAZ,CAAgBC,aAAhB,EAA7B;;AACA,YAAKC,qBAAL,CAA2B,MAAKL,UAAhC;AACD;;AAPmD;AAQrD;;;;WAED,mBAAgB;AACd,UAAI,KAAKE,MAAT,EAAiB;AACf,aAAKJ,MAAL,CAAYK,GAAZ,CAAgBG,aAAhB,CAA8B,KAAKJ,MAAnC;AAEA,aAAKA,MAAL,GAAcK,SAAd;AACD;AACF;;;WAGD,+BAA8BP,UAA9B,EAAqE;AACnE,yCAA6BQ,MAAM,CAACC,OAAP,CAAeT,UAAf,CAA7B,qCAAyD;AAApD;AAAA,YAAOU,KAAP;AAAA,YAAcC,KAAd;;AAGH,YAAMC,KAAK,GAAGC,MAAM,CAACH,KAAD,CAApB;;AACA,gBAAQE,KAAR;AACE,eAAKE,mBAAGC,eAAR;AACA,eAAKD,mBAAGE,eAAR;AACE,iBAAKlB,MAAL,CAAYK,GAAZ,CAAgBc,iBAAhB,CAAkC,KAAKf,MAAvC,EAA+CU,KAA/C,EAAsDD,KAAtD;AACA;;AACF;AACE,iBAAKb,MAAL,CAAYK,GAAZ,CAAgBe,iBAAhB,CAAkC,KAAKhB,MAAvC,EAA+CU,KAA/C,EAAsDD,KAAtD;AACA;AAPJ;AASD;AACF;;;EAvCuCQ,Y","sourcesContent":["// luma.gl, MIT license\n\nimport {Sampler, SamplerProps} from '@luma.gl/api';\nimport GL from '@luma.gl/constants';\nimport type {GLSamplerParameters} from '../../types/webgl';\nimport {convertSamplerParametersToWebGL} from '../converters/sampler-parameters';\nimport type WebGLDevice from '../webgl-device';\n\n/**\n * Sampler object -\n * Under WebGL2 we create an actual WebGL sampler\n * Under WebGL1, we just store the sampler parameters\n * so that they can be set directly on the texture\n * https://github.com/WebGLSamples/WebGL2Samples/blob/master/samples/sampler_object.html\n */\nexport default class WEBGLSampler extends Sampler {\n  readonly device: WebGLDevice;\n  readonly handle: WebGLSampler;\n  readonly parameters: GLSamplerParameters;\n\n  constructor(device: WebGLDevice, props: SamplerProps) {\n    super(device, props);\n    this.device = device;\n    this.parameters = convertSamplerParametersToWebGL(props);\n    if (this.device.isWebGL2) {\n      this.handle = this.handle || this.device.gl2.createSampler();\n      this._setSamplerParameters(this.parameters);\n    }\n  }\n\n  destroy(): void {\n    if (this.handle) {\n      this.device.gl2.deleteSampler(this.handle);\n      // @ts-expect-error\n      this.handle = undefined;\n    }\n  }\n\n  /** Set sampler parameters on the sampler */\n  private _setSamplerParameters(parameters: GLSamplerParameters): void {\n    for (const [pname, value] of Object.entries(parameters)) {\n      // Apparently there are integer/float conversion issues requires two parameter setting functions in JavaScript.\n      // For now, pick the float version for parameters specified as GLfloat.\n      const param = Number(pname);\n      switch (param) {\n        case GL.TEXTURE_MIN_LOD:\n        case GL.TEXTURE_MAX_LOD:\n          this.device.gl2.samplerParameterf(this.handle, param, value);\n          break;\n        default:\n          this.device.gl2.samplerParameteri(this.handle, param, value);\n          break;\n      }\n    }\n  }\n}\n"],"file":"webgl-sampler.js"}

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,8 +80,8 @@ var WEBGLShader = function (_Shader) {
     value: function destroy() {
       if (this.handle) {
         this.removeStats();
-        this.gl.deleteShader(this.handle);
-        this.handle = null;
+        this.device.gl.deleteShader(this.handle);
+        this.destroyed = true;
       }
     }
   }, {
@@ -100,8 +93,8 @@ var WEBGLShader = function (_Shader) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                log = this.gl.getShaderInfoLog(this.handle);
-                return _context.abrupt("return", (0, _parseShaderCompilerLog.parseShaderCompilerLog)(log));
+                log = this.device.gl.getShaderInfoLog(this.handle);
+                return _context.abrupt("return", log ? (0, _parseShaderCompilerLog.parseShaderCompilerLog)(log) : []);
 
               case 2:
               case "end":
@@ -125,13 +118,15 @@ 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 messages = (0, _parseShaderCompilerLog.parseShaderCompilerLog)(shaderLog).filter(function (message) {
+        var shaderLog = gl.getShaderInfoLog(this.handle);
+        var parsedLog = shaderLog ? (0, _parseShaderCompilerLog.parseShaderCompilerLog)(shaderLog) : [];
+        var messages = parsedLog.filter(function (message) {
           return message.type === 'error';
         });
         var formattedLog = (0, _shadertools.formatCompilerLog)(messages, source);
@@ -147,7 +142,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","destroyed","log","getShaderInfoLog","addGLSLVersion","startsWith","shaderSource","compileShader","compileStatus","getShaderParameter","COMPILE_STATUS","shaderLog","parsedLog","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      // 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);\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"}