@genome-spy/core 0.77.0 → 0.79.0

package/dist/src/gl/vertexRangeIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vertexRangeIndex.d.ts","sourceRoot":"","sources":["../../../src/gl/vertexRangeIndex.js"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AACH,+CARW,MAAM,UACN,CAAC,MAAM,EAAE,MAAM,CAAC,aAChB,YAAY,YACZ,YAAY,qBACZ,MAAM,mBACN,MAAM,GACJ,OAAO,yBAAyB,EAAE,MAAM,GAAG,SAAS,CA6HhE;yCA9IU,MAAM,KACJ,MAAM"}
+{"version":3,"file":"vertexRangeIndex.d.ts","sourceRoot":"","sources":["../../../src/gl/vertexRangeIndex.js"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AACH,+CARW,MAAM,UACN,CAAC,MAAM,EAAE,MAAM,CAAC,aAChB,YAAY,YACZ,YAAY,qBACZ,MAAM,mBACN,MAAM,GACJ,OAAO,yBAAyB,EAAE,MAAM,GAAG,SAAS,CA+HhE;yCAhJU,MAAM,KACJ,MAAM"}

package/dist/src/gl/vertexRangeIndex.js

@@ -40,6 +40,8 @@ export function createVertexRangeIndexer(
         return undefined;
     }
 
+    const pointIndex = readStart === readEnd;
+
     const startIndices = new Array(size);
     startIndices.fill(MAX_INTEGER);
 
@@ -105,14 +107,14 @@ export function createVertexRangeIndexer(
             break;
         }
 
-        if (runX < lastStart || runX2 < runX) {
+        if (runX < lastStart || (!pointIndex && runX2 < runX)) {
             unordered = true;
             break;
         }
         lastStart = runX;
 
         const startBin = getBin(runX, false);
-        const endBin = getBin(runX2, true);
+        const endBin = pointIndex ? startBin : getBin(runX2, true);
 
         for (let bin = startBin; bin <= endBin; bin++) {
             if (startIndices[bin] > runStart) {

package/dist/src/gl/webGLHelper.d.ts

@@ -74,7 +74,7 @@ export default class WebGLHelper {
     /** @type {import("twgl.js").AttachmentOptions[]} */
     _pickingAttachmentOptions: import("twgl.js").AttachmentOptions[];
     _pickingBufferInfo: import("twgl.js").FramebufferInfo;
-    invalidateSize(): void;
+    invalidateSize(): boolean;
     /**
      * Compiles and caches a shader. The shader source is used as a cache key.
      *

package/dist/src/gl/webGLHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webGLHelper.d.ts","sourceRoot":"","sources":["../../../src/gl/webGLHelper.js"],"names":[],"mappings":"AA0cA;;;;GAIG;AACH,kCAJW,sBAAsB,gBACtB,WAAW,kBACX,WAAW;;;;;;EA8CrB;AAED;;;;;GAKG;AACH,0CALW,qBAAqB,WACrB,IAAI,CAAC,OAAO,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAC7C,MAAM,EAAE,GAAG,eAAe,YAC1B,YAAY,gBAYtB;AAED;;;;;;GAMG;AACH,qCALW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,KACjC,MAAM,KACN,MAAM,2BAWhB;AAED;;;;;GAKG;AACH,yCAJW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,SACjC,MAAM,UA4BhB;AA9hBD;IACI;;;;;;;;OAQG;IACH,uBAPW,WAAW,eACX,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,2BAGrC,sBAAsB,mBACtB,MAAM,IAAI,EAoHpB;IArGG;;OAEG;IACH,mBAFU,gBAAgB,CAEQ;IAElC;;OAEG;IACH,oBAFU;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAEjF;IAEnC,yBAAyB;IACzB,iBADW,MAAM,IAAI,CAC8B;IAEnD,uCAAuC;IACvC,cADW,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CACN;IAE7B,6EAA6E;IAC7E,eADW,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,EAAE,YAAY,CAAC,CACvC;IAElC;;OAEG;IACH,mBAFU,OAAO,CAAC,OAAO,4BAA4B,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAEnD;IA8CtC,0BAAoB;IACpB,2BAAY;IAGZ,oDAAoD;IACpD,2BADW,OAAO,SAAS,EAAE,iBAAiB,EAAE,CAQ/C;IACD,sDAGC;IAmBL,uBAGC;IAED;;;;;OAKG;IACH,oBAHW,MAAM,QACN,MAAM,GAAG,MAAM,EAAE,eA2B3B;IAED,oBAkCC;IAED,iBAGC;IAED;;;;OAIG;IACH,oCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;;;MAI3C;IAED;;;;OAIG;IACH,kCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,UAI3C;IAED;;;OAGG;IACH;;;MAEC;IAED;;;;;;;;;OASG;IACH,+BAHW,OAAO,8BAA8B,EAAE,OAAO,WAC9C,OAAO,QA2GjB;IAED;;OAEG;IACH,kCAFW,OAAO,4BAA4B,EAAE,mBAAmB,0BAwClE;CACJ;6BAxY4B,uBAAuB"}
+{"version":3,"file":"webGLHelper.d.ts","sourceRoot":"","sources":["../../../src/gl/webGLHelper.js"],"names":[],"mappings":"AA+cA;;;;GAIG;AACH,kCAJW,sBAAsB,gBACtB,WAAW,kBACX,WAAW;;;;;;EA8CrB;AAED;;;;;GAKG;AACH,0CALW,qBAAqB,WACrB,IAAI,CAAC,OAAO,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAC7C,MAAM,EAAE,GAAG,eAAe,YAC1B,YAAY,gBAYtB;AAED;;;;;;GAMG;AACH,qCALW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,KACjC,MAAM,KACN,MAAM,2BAWhB;AAED;;;;;GAKG;AACH,yCAJW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,SACjC,MAAM,UA4BhB;AAliBD;IACI;;;;;;;;OAQG;IACH,uBAPW,WAAW,eACX,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,2BAGrC,sBAAsB,mBACtB,MAAM,IAAI,EAoHpB;IArGG;;OAEG;IACH,mBAFU,gBAAgB,CAEQ;IAElC;;OAEG;IACH,oBAFU;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAEjF;IAEnC,yBAAyB;IACzB,iBADW,MAAM,IAAI,CAC8B;IAEnD,uCAAuC;IACvC,cADW,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CACN;IAE7B,6EAA6E;IAC7E,eADW,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,EAAE,YAAY,CAAC,CACvC;IAElC;;OAEG;IACH,mBAFU,OAAO,CAAC,OAAO,4BAA4B,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAEnD;IA8CtC,0BAAoB;IACpB,2BAAY;IAGZ,oDAAoD;IACpD,2BADW,OAAO,SAAS,EAAE,iBAAiB,EAAE,CAQ/C;IACD,sDAGC;IAmBL,0BAKC;IAED;;;;;OAKG;IACH,oBAHW,MAAM,QACN,MAAM,GAAG,MAAM,EAAE,eA2B3B;IAED,oBAkCC;IAED,iBAGC;IAED;;;;OAIG;IACH,oCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;;;MAI3C;IAED;;;;OAIG;IACH,kCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,UAI3C;IAED;;;OAGG;IACH;;;MAEC;IAED;;;;;;;;;OASG;IACH,+BAHW,OAAO,8BAA8B,EAAE,OAAO,WAC9C,OAAO,QA6GjB;IAED;;OAEG;IACH,kCAFW,OAAO,4BAA4B,EAAE,mBAAmB,0BAwClE;CACJ;6BA5Y4B,uBAAuB"}

package/dist/src/gl/webGLHelper.js

@@ -21,6 +21,7 @@ import {
     createInterpolatedColorTexture,
     createSchemeTexture,
 } from "./colorUtils.js";
+import { getDiscreteRangeCountForGlsl } from "./glslScaleGenerator.js";
 import {
     getDiscreteRangeMapper,
     isColorChannel,
@@ -161,7 +162,9 @@ export default class WebGLHelper {
 
     invalidateSize() {
         this._canvasSizeHelper.invalidate();
-        this.adjustGl();
+        // The return value tells layout code whether cached render commands may
+        // have been built against a stale logical or physical canvas size.
+        return this.adjustGl();
     }
 
     /**
@@ -290,10 +293,8 @@ export default class WebGLHelper {
         function fixCount(count, scale) {
             if (isDiscrete(scale.type)) {
                 return scale.domain().length;
-            } else if (scale.type == "threshold") {
-                return scale.domain().length + 1;
-            } else if (scale.type == "quantize") {
-                return count ?? 4;
+            } else if (scale.type == "threshold" || scale.type == "quantize") {
+                return getDiscreteRangeCountForGlsl(scale);
             } else if (scale.type == "quantile") {
                 return count ?? 4;
             }
@@ -317,7 +318,7 @@ export default class WebGLHelper {
                     texture = createDiscreteColorTexture(
                         range,
                         this.gl,
-                        scale.domain().length,
+                        getDiscreteRangeCountForGlsl(scale),
                         existingTexture
                     );
                 } else {
@@ -351,7 +352,9 @@ export default class WebGLHelper {
                 texture = createDiscreteColorTexture(
                     range,
                     this.gl,
-                    scale.domain().length,
+                    isDiscretizing(scale.type)
+                        ? getDiscreteRangeCountForGlsl(scale)
+                        : scale.domain().length,
                     existingTexture
                 );
             }
@@ -373,7 +376,9 @@ export default class WebGLHelper {
                     createDiscreteTexture(
                         range.map(mapper),
                         this.gl,
-                        scale.domain().length,
+                        isDiscretizing(scale.type)
+                            ? getDiscreteRangeCountForGlsl(scale)
+                            : scale.domain().length,
                         existingTexture
                     )
                 );

package/dist/src/marks/__snapshots__/shaderSnapshot.test.js.snap

@@ -43,6 +43,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -71,6 +73,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -309,6 +320,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -337,6 +350,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -996,8 +1018,17 @@ void main(void) {
 
     float size = getScaled_size();
     vec2 pos = vec2(getScaled_x(), getScaled_y()) + getDxDy();
+    vec2 facetedPos = applySampleFacet(pos);
+
+#ifdef VISIBLE_RANGE_CULLING
+    if (isOutsideVisibleRange(facetedPos)) {
+        gl_PointSize = 0.0;
+        gl_Position = vec4(100.0, 0.0, 0.0, 0.0);
+        return;
+    }
+#endif
 
-    gl_Position = unitToNdc(applySampleFacet(pos));
+    gl_Position = unitToNdc(facetedPos);
 
     float strokeWidth = getScaled_strokeWidth();
 
@@ -1115,6 +1146,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -1143,6 +1176,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -1293,6 +1335,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -1321,6 +1365,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -2199,6 +2252,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -2227,6 +2282,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -2471,6 +2535,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -2499,6 +2565,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -3195,8 +3270,17 @@ void main(void) {
 
     float size = getScaled_size();
     vec2 pos = vec2(getScaled_x(), getScaled_y()) + getDxDy();
+    vec2 facetedPos = applySampleFacet(pos);
+
+#ifdef VISIBLE_RANGE_CULLING
+    if (isOutsideVisibleRange(facetedPos)) {
+        gl_PointSize = 0.0;
+        gl_Position = vec4(100.0, 0.0, 0.0, 0.0);
+        return;
+    }
+#endif
 
-    gl_Position = unitToNdc(applySampleFacet(pos));
+    gl_Position = unitToNdc(facetedPos);
 
     float strokeWidth = getScaled_strokeWidth();
 
@@ -3310,6 +3394,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -3338,6 +3424,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -3576,6 +3671,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -3604,6 +3701,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -4261,8 +4367,17 @@ void main(void) {
 
     float size = getScaled_size();
     vec2 pos = vec2(getScaled_x(), getScaled_y()) + getDxDy();
+    vec2 facetedPos = applySampleFacet(pos);
 
-    gl_Position = unitToNdc(applySampleFacet(pos));
+#ifdef VISIBLE_RANGE_CULLING
+    if (isOutsideVisibleRange(facetedPos)) {
+        gl_PointSize = 0.0;
+        gl_Position = vec4(100.0, 0.0, 0.0, 0.0);
+        return;
+    }
+#endif
+
+    gl_Position = unitToNdc(facetedPos);
 
     float strokeWidth = getScaled_strokeWidth();
 
@@ -4385,6 +4500,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -4413,6 +4530,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }
@@ -4770,6 +4896,8 @@ uniform View {
     mediump vec2 uViewScale;
     /** Size of the logical viewport in pixels, i.e., the view */
     mediump vec2 uViewportSize;
+    mediump vec4 uLogicalVisibleRect;
+    lowp vec2 uCullByVisibleRange;
     lowp float uDevicePixelRatio;
     // TODO: Views with opacity less than 1.0 should be rendered into a texture
     // that is rendered with the specified opacity.
@@ -4798,6 +4926,15 @@ vec4 pixelsToNdc(float x, float y) {
     return pixelsToNdc(vec2(x, y));
 }
 
+bool isOutsideVisibleRange(vec2 pos) {
+    return (uCullByVisibleRange.x > 0.5 &&
+                (pos.x < uLogicalVisibleRect.x ||
+                 pos.x > uLogicalVisibleRect.z)) ||
+           (uCullByVisibleRange.y > 0.5 &&
+                (pos.y < uLogicalVisibleRect.y ||
+                 pos.y > uLogicalVisibleRect.w));
+}
+
 float linearstep(float edge0, float edge1, float x) {
     return clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
 }

package/dist/src/marks/mark.d.ts

@@ -1,6 +1,29 @@
+/**
+ * @param {{ width: number, height: number }} canvasSize
+ * @param {Rectangle} coords
+ * @param {ClipOptions | undefined} clip
+ * @param {boolean} [clipSelf]
+ */
+export function createViewportScope(canvasSize: {
+    width: number;
+    height: number;
+}, coords: Rectangle, clip: ClipOptions | undefined, clipSelf?: boolean): {
+    requiresScissor: boolean;
+    coords: import("../view/layout/rectangle.js").default;
+};
+/**
+ * @param {Rectangle} coords
+ * @param {ClipOptions | undefined} clip
+ * @returns {[number, number, number, number]}
+ */
+export function createLogicalVisibleRect(coords: Rectangle, clip: ClipOptions | undefined): [number, number, number, number];
 export const SAMPLE_FACET_UNIFORM: "SAMPLE_FACET_UNIFORM";
 export const SAMPLE_FACET_TEXTURE: "SAMPLE_FACET_TEXTURE";
 export const SELECTION_TEXTURE_PREFIX: "uSelectionTexture_";
+/**
+ * @typedef {import("../types/rendering.js").ClipOptions} ClipOptions
+ * @typedef {import("../view/layout/rectangle.js").default} Rectangle
+ */
 /**
  *
  * @typedef {import("../types/rendering.js").RenderingOptions} RenderingOptions
@@ -15,6 +38,13 @@ export const SELECTION_TEXTURE_PREFIX: "uSelectionTexture_";
  *
  * @typedef {"intersects" | "encloses" | "endpoints"} HitTestMode
  */
+/**
+ * @typedef {object} MarkDebugState
+ * @prop {boolean} markUniformsAltered
+ * @prop {number | undefined} vertexCount
+ * @prop {number | undefined} allocatedVertices
+ * @prop {Record<string, any>} properties
+ */
 /**
  * @template {MarkProps} [P=MarkProps]
  */
@@ -144,7 +174,7 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
      */
     get encoding(): import("../spec/channel.js").Encoding;
     getContext(): import("../types/viewContext.js").default;
-    getType(): "text" | "point" | "link" | "rect" | "rule" | "tick";
+    getType(): "rect" | "point" | "rule" | "tick" | "text" | "link";
     initializeData(): void;
     /**
      * Initialize encoders that encode fields of the data (or constants) to
@@ -159,7 +189,7 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
      * Update WebGL buffers from the data
      */
     updateGraphicsData(): void;
-    getSampleFacetMode(): "SAMPLE_FACET_UNIFORM" | "SAMPLE_FACET_TEXTURE";
+    getSampleFacetMode(): "SAMPLE_FACET_TEXTURE" | "SAMPLE_FACET_UNIFORM";
     /**
      *
      * @param {string} vertexShader
@@ -222,6 +252,10 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
      * Returns true if this mark instance participates in picking.
      */
     isPickingParticipant(): boolean;
+    /**
+     * @returns {MarkDebugState}
+     */
+    getDebugState(): MarkDebugState;
     /**
      * @protected
      */
@@ -265,13 +299,14 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
      * @param {{width: number, height: number}} canvasSize Size of the canvas in logical pixels
      * @param {number} dpr Device pixel ratio
      * @param {import("../view/layout/rectangle.js").default} coords
-     * @param {import("../view/layout/rectangle.js").default} [clipRect]
+     * @param {ClipOptions} [clip]
+     * @param {ClipOptions} [cullClip]
      * @returns {boolean} true if the viewport is renderable (size > 0)
      */
     setViewport(canvasSize: {
         width: number;
         height: number;
-    }, dpr: number, coords: import("../view/layout/rectangle.js").default, clipRect?: import("../view/layout/rectangle.js").default): boolean;
+    }, dpr: number, coords: import("../view/layout/rectangle.js").default, clip?: ClipOptions, cullClip?: ClipOptions): boolean;
     /**
      * Finds a datum that overlaps the given value on the x domain.
      * The result is unspecified if multiple data are found.
@@ -285,6 +320,8 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
     findDatumAt(facetId: string, x: import("../spec/channel.js").Scalar): any;
     #private;
 }
+export type ClipOptions = import("../types/rendering.js").ClipOptions;
+export type Rectangle = import("../view/layout/rectangle.js").default;
 export type RenderingOptions = import("../types/rendering.js").RenderingOptions;
 export type _MarkRenderingOptions = {
     /**
@@ -296,6 +333,12 @@ export type _MarkRenderingOptions = {
 export type MarkRenderingOptions = RenderingOptions & _MarkRenderingOptions;
 export type DrawFunction = (offset: number, count: number) => any;
 export type HitTestMode = "intersects" | "encloses" | "endpoints";
+export type MarkDebugState = {
+    markUniformsAltered: boolean;
+    vertexCount: number | undefined;
+    allocatedVertices: number | undefined;
+    properties: Record<string, any>;
+};
 /**
  * @augments {InternMap<K, import("../gl/dataToVertices.js").RangeEntry>}
  * @template K

package/dist/src/marks/mark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}