@luma.gl/webgl 9.0.0-alpha.8 → 9.0.0-beta.1

package/dist/adapter/resources/webgl-render-pass.d.ts

@@ -1,11 +1,26 @@
-import { RenderPass, RenderPassProps } from '@luma.gl/api';
-import WebGLDevice from '../webgl-device';
-export default class WEBGLRenderPass extends RenderPass {
+import { RenderPass, RenderPassProps, NumberArray, RenderPassParameters } from '@luma.gl/core';
+import { WebGLDevice } from '../webgl-device';
+import { GLParameters } from '@luma.gl/constants';
+export declare class WEBGLRenderPass extends RenderPass {
     readonly device: WebGLDevice;
+    /** Parameters that should be applied before each draw call */
+    glParameters: GLParameters;
     constructor(device: WebGLDevice, props: RenderPassProps);
-    endPass(): void;
+    end(): void;
     pushDebugGroup(groupLabel: string): void;
     popDebugGroup(): void;
     insertDebugMarker(markerLabel: string): void;
+    /**
+     * Maps RenderPass parameters to GL parameters
+     */
+    setParameters(parameters?: RenderPassParameters): void;
+    /**
+     * Optionally clears depth, color and stencil buffers based on parameters
+     */
+    protected clear(): void;
+    /**
+     * WebGL2 - clear a specific color buffer
+     */
+    protected clearColorBuffer(drawBuffer?: number, value?: NumberArray): void;
 }
 //# sourceMappingURL=webgl-render-pass.d.ts.map

package/dist/adapter/resources/webgl-render-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AACzD,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU;IACrD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAKvD,OAAO,IAAI,IAAI;IAEf,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CAQ7C"}
+{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAYpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAC;gBAEf,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAYvD,GAAG,IAAI,IAAI;IAQX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAS5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IAiD1D;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IA+BvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,WAA0B;CAwCrF"}

package/dist/adapter/resources/webgl-render-pass.js

@@ -1,21 +1,107 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { RenderPass } from '@luma.gl/api';
-export default class WEBGLRenderPass extends RenderPass {
+import { RenderPass } from '@luma.gl/core';
+import { withGLParameters } from "../../context/state-tracker/with-parameters.js";
+import { setGLParameters } from "../../context/parameters/unified-parameter-api.js";
+import { pushContextState, popContextState } from "../../context/state-tracker/track-context-state.js";
+const GL_DEPTH_BUFFER_BIT = 0x00000100;
+const GL_STENCIL_BUFFER_BIT = 0x00000400;
+const GL_COLOR_BUFFER_BIT = 0x00004000;
+const GL_COLOR = 0x1800;
+export class WEBGLRenderPass extends RenderPass {
   constructor(device, props) {
     super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
+    this.device = void 0;
+    this.glParameters = void 0;
     this.device = device;
+    pushContextState(this.device.gl);
+    this.setParameters(this.props.parameters);
+    this.clear();
+  }
+  end() {
+    popContextState(this.device.gl);
+    if (this.props.framebuffer) {
+      setGLParameters(this.device, {
+        framebuffer: null
+      });
+    }
   }
-
-  endPass() {}
-
   pushDebugGroup(groupLabel) {}
-
   popDebugGroup() {}
-
   insertDebugMarker(markerLabel) {}
-
+  setParameters() {
+    let parameters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const glParameters = {};
+    if (this.props.framebuffer) {
+      glParameters.framebuffer = this.props.framebuffer;
+    }
+    if (this.props.depthReadOnly) {
+      glParameters.depthMask = !this.props.depthReadOnly;
+    }
+    glParameters.stencilMask = this.props.stencilReadOnly ? 0 : 1;
+    glParameters[35977] = this.props.discard;
+    if (parameters.viewport) {
+      if (parameters.viewport.length >= 6) {
+        glParameters.viewport = parameters.viewport.slice(0, 4);
+        glParameters.depthRange = [parameters.viewport[4], parameters.viewport[5]];
+      } else {
+        glParameters.viewport = parameters.viewport;
+      }
+    }
+    glParameters.scissorTest = Boolean(parameters.scissorRect);
+    if (parameters.scissorRect) {
+      glParameters.scissor = parameters.scissorRect;
+    }
+    if (parameters.blendConstant) {
+      glParameters.blendColor = parameters.blendConstant;
+    }
+    if (parameters.stencilReference) {
+      console.warn('RenderPassParameters.stencilReference not yet implemented in WebGL');
+      parameters[2967] = parameters.stencilReference;
+    }
+    this.glParameters = glParameters;
+    setGLParameters(this.device, glParameters);
+  }
+  clear() {
+    const glParameters = {
+      ...this.glParameters
+    };
+    let clearMask = 0;
+    if (this.props.clearColor !== false) {
+      clearMask |= GL_COLOR_BUFFER_BIT;
+      glParameters.clearColor = this.props.clearColor;
+    }
+    if (this.props.clearDepth !== false) {
+      clearMask |= GL_DEPTH_BUFFER_BIT;
+      glParameters.clearDepth = this.props.clearDepth;
+    }
+    if (this.props.clearStencil !== false) {
+      clearMask |= GL_STENCIL_BUFFER_BIT;
+      glParameters.clearStencil = this.props.clearStencil;
+    }
+    if (clearMask !== 0) {
+      withGLParameters(this.device, glParameters, () => {
+        this.device.gl.clear(clearMask);
+      });
+    }
+  }
+  clearColorBuffer() {
+    let drawBuffer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    let value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [0, 0, 0, 0];
+    withGLParameters(this.device.gl2, {
+      framebuffer: this.props.framebuffer
+    }, () => {
+      switch (value.constructor) {
+        case Int32Array:
+          this.device.gl2.clearBufferiv(GL_COLOR, drawBuffer, value);
+          break;
+        case Uint32Array:
+          this.device.gl2.clearBufferuiv(GL_COLOR, drawBuffer, value);
+          break;
+        case Float32Array:
+        default:
+          this.device.gl2.clearBufferfv(GL_COLOR, drawBuffer, value);
+          break;
+      }
+    });
+  }
 }
 //# sourceMappingURL=webgl-render-pass.js.map

package/dist/adapter/resources/webgl-render-pass.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":["RenderPass","WEBGLRenderPass","constructor","device","props","endPass","pushDebugGroup","groupLabel","popDebugGroup","insertDebugMarker","markerLabel"],"mappings":";AAAA,SAAQA,UAAR,QAA0C,cAA1C;AAGA,eAAe,MAAMC,eAAN,SAA8BD,UAA9B,CAAyC;AAGtDE,EAAAA,WAAW,CAACC,MAAD,EAAsBC,KAAtB,EAA8C;AACvD,UAAMD,MAAN,EAAcC,KAAd;;AADuD;;AAEvD,SAAKD,MAAL,GAAcA,MAAd;AACD;;AAEDE,EAAAA,OAAO,GAAS,CAAE;;AAElBC,EAAAA,cAAc,CAACC,UAAD,EAA2B,CAAE;;AAC3CC,EAAAA,aAAa,GAAS,CAAE;;AACxBC,EAAAA,iBAAiB,CAACC,WAAD,EAA4B,CAAE;;AAZO","sourcesContent":["import {RenderPass, RenderPassProps} from '@luma.gl/api';\nimport WebGLDevice from '../webgl-device';\n\nexport default class WEBGLRenderPass extends RenderPass {\n  readonly device: WebGLDevice;\n\n  constructor(device: WebGLDevice, props: RenderPassProps) {\n    super(device, props);\n    this.device = device;\n  }\n\n  endPass(): void {}\n\n  pushDebugGroup(groupLabel: string): void {}\n  popDebugGroup(): void {}\n  insertDebugMarker(markerLabel: string): void {}\n\n  // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;\n\n  // beginOcclusionQuery(queryIndex: number): void;\n  // endOcclusionQuery(): void;\n\n  // executeBundles(bundles: Iterable<GPURenderBundle>): void;\n}\n"],"file":"webgl-render-pass.js"}
+{"version":3,"file":"webgl-render-pass.js","names":["RenderPass","withGLParameters","setGLParameters","pushContextState","popContextState","GL_DEPTH_BUFFER_BIT","GL_STENCIL_BUFFER_BIT","GL_COLOR_BUFFER_BIT","GL_COLOR","WEBGLRenderPass","constructor","device","props","glParameters","gl","setParameters","parameters","clear","end","framebuffer","pushDebugGroup","groupLabel","popDebugGroup","insertDebugMarker","markerLabel","arguments","length","undefined","depthReadOnly","depthMask","stencilMask","stencilReadOnly","discard","viewport","slice","depthRange","scissorTest","Boolean","scissorRect","scissor","blendConstant","blendColor","stencilReference","console","warn","clearMask","clearColor","clearDepth","clearStencil","clearColorBuffer","drawBuffer","value","gl2","Int32Array","clearBufferiv","Uint32Array","clearBufferuiv","Float32Array","clearBufferfv"],"sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {RenderPass, RenderPassProps, NumberArray, RenderPassParameters} from '@luma.gl/core';\nimport {WebGLDevice} from '../webgl-device';\nimport {GL, GLParameters} from '@luma.gl/constants';\nimport {withGLParameters} from '../../context/state-tracker/with-parameters';\nimport {setGLParameters} from '../../context/parameters/unified-parameter-api';\nimport {pushContextState, popContextState} from '../../context/state-tracker/track-context-state';\n\n// Should collapse during minification\nconst GL_DEPTH_BUFFER_BIT = 0x00000100;\nconst GL_STENCIL_BUFFER_BIT = 0x00000400;\nconst GL_COLOR_BUFFER_BIT = 0x00004000;\n\nconst GL_COLOR = 0x1800;\n\nexport class WEBGLRenderPass extends RenderPass {\n  readonly device: WebGLDevice;\n\n  /** Parameters that should be applied before each draw call */\n  glParameters: GLParameters;\n\n  constructor(device: WebGLDevice, props: RenderPassProps) {\n    super(device, props);\n    this.device = device;\n\n    // TODO - do parameters (scissorRect) affect the clear operation?\n    pushContextState(this.device.gl);\n    this.setParameters(this.props.parameters);\n\n    // Hack - for now WebGL draws in \"immediate mode\" (instead of queueing the operations)...\n    this.clear();\n  }\n\n  end(): void {\n    popContextState(this.device.gl);\n    if (this.props.framebuffer) {\n      setGLParameters(this.device, {framebuffer: null});\n    }\n    // should add commands to CommandEncoder.\n  }\n\n  pushDebugGroup(groupLabel: string): void {}\n  popDebugGroup(): void {}\n  insertDebugMarker(markerLabel: string): void {}\n\n  // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;\n\n  // beginOcclusionQuery(queryIndex: number): void;\n  // endOcclusionQuery(): void;\n\n  // executeBundles(bundles: Iterable<GPURenderBundle>): void;\n\n  /**\n   * Maps RenderPass parameters to GL parameters\n   */\n  setParameters(parameters: RenderPassParameters = {}): void {\n    const glParameters: GLParameters = {};\n\n    // Framebuffers are specified using parameters in WebGL\n    if (this.props.framebuffer) {\n      glParameters.framebuffer = this.props.framebuffer;\n    }\n\n    if (this.props.depthReadOnly) {\n      glParameters.depthMask = !this.props.depthReadOnly;\n    }\n\n    glParameters.stencilMask = this.props.stencilReadOnly ? 0 : 1;\n\n    glParameters[GL.RASTERIZER_DISCARD] = this.props.discard;\n\n    // Map the four renderpass parameters to WebGL parameters\n    if (parameters.viewport) {\n      // WebGPU viewports are 6 coordinates (X, Y, Z)\n      if (parameters.viewport.length >= 6) {\n        glParameters.viewport = parameters.viewport.slice(0, 4);\n        glParameters.depthRange = [parameters.viewport[4], parameters.viewport[5]];\n      } else {\n        // WebGL viewports are 4 coordinates (X, Y)\n        glParameters.viewport = parameters.viewport;\n      }\n    }\n    glParameters.scissorTest = Boolean(parameters.scissorRect);\n    if (parameters.scissorRect) {\n      glParameters.scissor = parameters.scissorRect;\n    }\n    if (parameters.blendConstant) {\n      glParameters.blendColor = parameters.blendConstant;\n    }\n    if (parameters.stencilReference) {\n      // eslint-disable-next-line no-console\n      console.warn('RenderPassParameters.stencilReference not yet implemented in WebGL');\n      // parameters.stencilFunc = [func, ref, mask];\n      // Does this work?\n      parameters[GL.STENCIL_REF] = parameters.stencilReference;\n    }\n\n    this.glParameters = glParameters;\n\n    setGLParameters(this.device, glParameters);\n  }\n\n  // Internal\n\n  /**\n   * Optionally clears depth, color and stencil buffers based on parameters\n   */\n  protected clear(): void {\n    const glParameters: GLParameters = {...this.glParameters};\n\n    let clearMask = 0;\n\n    if (this.props.clearColor !== false) {\n      clearMask |= GL_COLOR_BUFFER_BIT;\n      glParameters.clearColor = this.props.clearColor;\n    }\n    if (this.props.clearDepth !== false) {\n      clearMask |= GL_DEPTH_BUFFER_BIT;\n      glParameters.clearDepth = this.props.clearDepth;\n    }\n    if (this.props.clearStencil !== false) {\n      clearMask |= GL_STENCIL_BUFFER_BIT;\n      glParameters.clearStencil = this.props.clearStencil;\n    }\n\n    if (clearMask !== 0) {\n      // Temporarily set any clear \"colors\" and call clear\n      withGLParameters(this.device, glParameters, () => {\n        this.device.gl.clear(clearMask);\n      });\n\n      // TODO - clear multiple color attachments\n      // for (attachment of this.framebuffer.colorAttachments) {\n      //   this.clearColorBuffer  \n      // }\n    }\n  }\n\n  /** \n   * WebGL2 - clear a specific color buffer \n   */\n  protected clearColorBuffer(drawBuffer: number = 0, value: NumberArray = [0, 0, 0, 0]) {\n    withGLParameters(this.device.gl2, {framebuffer: this.props.framebuffer}, () => {\n      // Method selection per OpenGL ES 3 docs\n      switch (value.constructor) {\n        case Int32Array:\n          this.device.gl2.clearBufferiv(GL_COLOR, drawBuffer, value);\n          break;\n        case Uint32Array:\n          this.device.gl2.clearBufferuiv(GL_COLOR, drawBuffer, value);\n          break;\n        case Float32Array:\n        default:\n          this.device.gl2.clearBufferfv(GL_COLOR, drawBuffer, value);\n          break;\n      }\n    });\n  }\n\n  // clearDepthStencil() {\n  // const GL_DEPTH = 0x1801;\n  // const GL_STENCIL = 0x1802;\n  // const GL_DEPTH_STENCIL = 0x84f9;\n\n  //     case GL_DEPTH:\n  //       this.device.gl2.clearBufferfv(GL_DEPTH, 0, [value]);\n  //       break;\n\n  //     case GL_STENCIL:\n  //       this.device.gl2.clearBufferiv(GL_STENCIL, 0, [value]);\n  //       break;\n\n  //     case GL_DEPTH_STENCIL:\n  //       const [depth, stencil] = value;\n  //       this.device.gl2.clearBufferfi(GL_DEPTH_STENCIL, 0, depth, stencil);\n  //       break;\n\n  //     default:\n  //       assert(false, ERR_ARGUMENTS);\n  //   }\n  // });\n}\n\n"],"mappings":"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"}

package/dist/adapter/resources/webgl-render-pipeline.d.ts

@@ -1,38 +1,47 @@
-import type { RenderPipelineProps, RenderPass, Buffer, Binding, ShaderLayout } from '@luma.gl/api';
-import { RenderPipeline } from '@luma.gl/api';
-import WebGLDevice from '../webgl-device';
-import WEBGLShader from './webgl-shader';
-import WEBGLVertexArrayObject from '../objects/webgl-vertex-array-object';
+import type { UniformValue, RenderPipelineProps, Binding } from '@luma.gl/core';
+import type { ShaderLayout } from '@luma.gl/core';
+import type { RenderPass, VertexArray } from '@luma.gl/core';
+import { RenderPipeline } from '@luma.gl/core';
+import { WebGLDevice } from '../webgl-device';
+import { WEBGLShader } from './webgl-shader';
+import { WEBGLTransformFeedback } from './webgl-transform-feedback';
 /** Creates a new render pipeline */
-export default class WEBGLRenderPipeline extends RenderPipeline {
+export declare class WEBGLRenderPipeline extends RenderPipeline {
+    /** The WebGL device that created this render pipeline */
     device: WebGLDevice;
+    /** Handle to underlying WebGL program */
     handle: WebGLProgram;
+    /** vertex shader */
     vs: WEBGLShader;
+    /** fragment shader */
     fs: WEBGLShader;
-    layout: ShaderLayout;
+    /** The layout extracted from shader by WebGL introspection APIs */
+    introspectedLayout: ShaderLayout;
+    /** Uniforms set on this model */
+    uniforms: Record<string, UniformValue>;
+    /** Bindings set on this model */
+    bindings: Record<string, Binding>;
+    /** WebGL varyings */
     varyings: string[] | null;
-    vertexArrayObject: WEBGLVertexArrayObject;
-    _indexBuffer?: Buffer;
-    uniforms: Record<string, any>;
-    bindings: Record<string, any>;
-    _textureUniforms: Record<string, any>;
-    _textureIndexCounter: number;
     _uniformCount: number;
     _uniformSetters: Record<string, Function>;
     constructor(device: WebGLDevice, props: RenderPipelineProps);
     destroy(): void;
-    setIndexBuffer(indexBuffer: Buffer): void;
-    /** @todo needed for portable model */
-    setAttributes(attributes: Record<string, Buffer>): void;
-    /** @todo needed for portable model */
+    /**
+     * Bindings include: textures, samplers and uniform buffers
+     * @todo needed for portable model
+     */
     setBindings(bindings: Record<string, Binding>): void;
-    setUniforms(uniforms: Record<string, any>): void;
+    /** This function is @deprecated, use uniform buffers */
+    setUniforms(uniforms: Record<string, UniformValue>): void;
     /** @todo needed for portable model
      * @note The WebGL API is offers many ways to draw things
      * This function unifies those ways into a single call using common parameters with sane defaults
      */
     draw(options: {
-        renderPass?: RenderPass;
+        renderPass: RenderPass;
+        /** vertex attributes */
+        vertexArray: VertexArray;
         vertexCount?: number;
         indexCount?: number;
         instanceCount?: number;
@@ -40,6 +49,7 @@ export default class WEBGLRenderPipeline extends RenderPipeline {
         firstIndex?: number;
         firstInstance?: number;
         baseVertex?: number;
+        transformFeedback?: WEBGLTransformFeedback;
     }): boolean;
     protected _compileAndLink(): void;
     /**
@@ -48,8 +58,12 @@ export default class WEBGLRenderPipeline extends RenderPipeline {
      * Note: This is currently done before every draw call
      */
     _areTexturesRenderable(): boolean;
-    /** Apply any bindings */
+    /** Apply any bindings (before each draw call) */
     _applyBindings(): void;
+    /**
+     * Due to program sharing, uniforms need to be reset before every draw call
+     * (though caching will avoid redundant WebGL calls)
+     */
     _applyUniforms(): void;
 }
 //# sourceMappingURL=webgl-render-pipeline.d.ts.map

package/dist/adapter/resources/webgl-render-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,UAAU,EACV,MAAM,EACN,OAAO,EACP,YAAY,EAIb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,cAAc,EAAgC,MAAM,cAAc,CAAC;AAU3E,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAE1C,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,OAAO,sBAAsB,MAAM,sCAAsC,CAAC;AAI1E,oCAAoC;AACpC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,cAAc;IAC7D,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,EAAE,EAAE,WAAW,CAAC;IAChB,EAAE,EAAE,WAAW,CAAC;IAChB,MAAM,EAAE,YAAY,CAAC;IAIrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IACjC,iBAAiB,EAAE,sBAAsB,CAAC;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACnC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACnC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC3C,oBAAoB,EAAE,MAAM,CAAK;IACjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;gBAEnC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IA4B3D,OAAO,IAAI,IAAI;IAQf,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAMzC,sCAAsC;IACtC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAwBvD,sCAAsC;IACtC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAqCpD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKzC;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO;IA2EX,SAAS,CAAC,eAAe;IA0BzB;;;;OAIG;IACH,sBAAsB;IAkBtB,yBAAyB;IACzB,cAAc;IA6Dd,cAAc;CASf"}
+{"version":3,"file":"webgl-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pipeline.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,mBAAmB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAsC,MAAM,eAAe,CAAC;AAUlF,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAK3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAKlE,oCAAoC;AACpC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,yDAAyD;IACzD,MAAM,EAAE,WAAW,CAAC;IACpB,yCAAyC;IACzC,MAAM,EAAE,YAAY,CAAC;IACrB,oBAAoB;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,sBAAsB;IACtB,EAAE,EAAE,WAAW,CAAC;IAChB,mEAAmE;IACnE,kBAAkB,EAAE,YAAY,CAAC;IAEjC,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAC5C,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACvC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IAEjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;gBAEnC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAqClD,OAAO,IAAI,IAAI;IAQxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAiDpD,wDAAwD;IACxD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAWlD;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,wBAAwB;QACxB,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;KAC5C,GAAG,OAAO;IA+GX,SAAS,CAAC,eAAe;IA4BzB;;;;OAIG;IACH,sBAAsB;IAatB,iDAAiD;IACjD,cAAc;IAgFd;;;OAGG;IACH,cAAc;CASf"}