@antv/l7-renderer 2.21.10 → 2.21.11-beta.1

package/es/device/DeviceModel.js

@@ -45,7 +45,7 @@ import {
   stencilFuncMap,
   stencilOpMap
 } from "./constants";
-var { isPlainObject, isTypedArray } = lodashUtil;
+var { isPlainObject, isTypedArray, isNil } = lodashUtil;
 var DeviceModel = class {
   constructor(device, options, service) {
     this.device = device;
@@ -104,7 +104,7 @@ var DeviceModel = class {
     if (elements) {
       this.indexBuffer = elements.get();
     }
-    const inputLayout = device.createInputLayout({
+    const inputLayout = service.renderCache.createInputLayout({
       vertexBufferDescriptors,
       indexBufferFormat: elements ? Format.U32_R : null,
       program: this.program
@@ -113,6 +113,7 @@ var DeviceModel = class {
     this.pipeline = this.createPipeline(options);
   }
   createPipeline(options, pick) {
+    var _a;
     const { primitive = gl.TRIANGLES, depth, cull, blend, stencil } = options;
     const depthParams = this.initDepthDrawParams({ depth });
     const depthEnabled = !!(depthParams && depthParams.enable);
@@ -122,7 +123,7 @@ var DeviceModel = class {
     const blendEnabled = !!(blendParams && blendParams.enable);
     const stencilParams = this.getStencilDrawParams({ stencil });
     const stencilEnabled = !!(stencilParams && stencilParams.enable);
-    return this.device.createRenderPipeline({
+    const pipeline = this.device.createRenderPipeline({
       // return this.service.renderCache.createRenderPipeline({
       inputLayout: this.inputLayout,
       program: this.program,
@@ -178,6 +179,10 @@ var DeviceModel = class {
         }
       }
     });
+    if (stencilEnabled && !isNil((_a = stencil == null ? void 0 : stencil.func) == null ? void 0 : _a.ref)) {
+      pipeline.stencilFuncReference = stencil.func.ref;
+    }
+    return pipeline;
   }
   updateAttributesAndElements() {
   }
@@ -221,7 +226,9 @@ var DeviceModel = class {
     );
     device["swapChainHeight"] = tmpHeight;
     renderPass.setPipeline(this.pipeline);
-    renderPass.setStencilReference(1);
+    if (!isNil(this.pipeline.stencilFuncReference)) {
+      renderPass.setStencilReference(this.pipeline.stencilFuncReference);
+    }
     renderPass.setVertexInput(
       this.inputLayout,
       this.vertexBuffers.map((buffer) => ({
@@ -277,7 +284,6 @@ var DeviceModel = class {
     (_a = this.vertexBuffers) == null ? void 0 : _a.forEach((buffer) => buffer.destroy());
     (_b = this.indexBuffer) == null ? void 0 : _b.destroy();
     (_c = this.bindings) == null ? void 0 : _c.destroy();
-    this.inputLayout.destroy();
     this.pipeline.destroy();
     this.destroyed = true;
   }

package/es/index.d.ts

@@ -1,6 +1,3 @@
-/**
- *
- */
 import DeviceRendererService from './device';
 import ReglRendererService from './regl';
 export { DeviceRendererService, ReglRendererService };

package/lib/device/DeviceModel.js

@@ -55,7 +55,7 @@ var import_l7_utils = require("@antv/l7-utils");
 var import_DeviceFramebuffer = __toESM(require("./DeviceFramebuffer"));
 var import_DeviceTexture2D = __toESM(require("./DeviceTexture2D"));
 var import_constants = require("./constants");
-var { isPlainObject, isTypedArray } = import_l7_utils.lodashUtil;
+var { isPlainObject, isTypedArray, isNil } = import_l7_utils.lodashUtil;
 var DeviceModel = class {
   constructor(device, options, service) {
     this.device = device;
@@ -114,7 +114,7 @@ var DeviceModel = class {
     if (elements) {
       this.indexBuffer = elements.get();
     }
-    const inputLayout = device.createInputLayout({
+    const inputLayout = service.renderCache.createInputLayout({
       vertexBufferDescriptors,
       indexBufferFormat: elements ? import_g_device_api.Format.U32_R : null,
       program: this.program
@@ -123,6 +123,7 @@ var DeviceModel = class {
     this.pipeline = this.createPipeline(options);
   }
   createPipeline(options, pick) {
+    var _a;
     const { primitive = import_l7_core.gl.TRIANGLES, depth, cull, blend, stencil } = options;
     const depthParams = this.initDepthDrawParams({ depth });
     const depthEnabled = !!(depthParams && depthParams.enable);
@@ -132,7 +133,7 @@ var DeviceModel = class {
     const blendEnabled = !!(blendParams && blendParams.enable);
     const stencilParams = this.getStencilDrawParams({ stencil });
     const stencilEnabled = !!(stencilParams && stencilParams.enable);
-    return this.device.createRenderPipeline({
+    const pipeline = this.device.createRenderPipeline({
       // return this.service.renderCache.createRenderPipeline({
       inputLayout: this.inputLayout,
       program: this.program,
@@ -188,6 +189,10 @@ var DeviceModel = class {
         }
       }
     });
+    if (stencilEnabled && !isNil((_a = stencil == null ? void 0 : stencil.func) == null ? void 0 : _a.ref)) {
+      pipeline.stencilFuncReference = stencil.func.ref;
+    }
+    return pipeline;
   }
   updateAttributesAndElements() {
   }
@@ -231,7 +236,9 @@ var DeviceModel = class {
     );
     device["swapChainHeight"] = tmpHeight;
     renderPass.setPipeline(this.pipeline);
-    renderPass.setStencilReference(1);
+    if (!isNil(this.pipeline.stencilFuncReference)) {
+      renderPass.setStencilReference(this.pipeline.stencilFuncReference);
+    }
     renderPass.setVertexInput(
       this.inputLayout,
       this.vertexBuffers.map((buffer) => ({
@@ -287,7 +294,6 @@ var DeviceModel = class {
     (_a = this.vertexBuffers) == null ? void 0 : _a.forEach((buffer) => buffer.destroy());
     (_b = this.indexBuffer) == null ? void 0 : _b.destroy();
     (_c = this.bindings) == null ? void 0 : _c.destroy();
-    this.inputLayout.destroy();
     this.pipeline.destroy();
     this.destroyed = true;
   }

package/lib/index.d.ts

@@ -1,6 +1,3 @@
-/**
- *
- */
 import DeviceRendererService from './device';
 import ReglRendererService from './regl';
 export { DeviceRendererService, ReglRendererService };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-renderer",
-  "version": "2.21.10",
+  "version": "2.21.11-beta.1",
   "description": "",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -16,11 +16,11 @@
     "@antv/g-device-api": "^1.6.4",
     "@babel/runtime": "^7.7.7",
     "regl": "1.6.1",
-    "@antv/l7-core": "2.21.10",
-    "@antv/l7-utils": "2.21.10"
+    "@antv/l7-core": "2.21.11-beta.1",
+    "@antv/l7-utils": "2.21.11-beta.1"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "^2.21.10"
+    "@antv/l7-test-utils": "^2.21.11-beta.1"
   },
   "publishConfig": {
     "access": "public",