@jbrowse/render-core 5.0.0-beta.7 → 5.0.0-beta.9

package/src/shaders/pointMark.js.generated.ts

@@ -16,49 +16,68 @@ function _min(a: number, b: number) {
   return b < a || Number.isNaN(a) ? b : a
 }
 
+function log1pf(x: number): number {
+  let u = (1.0 + x)
+  let _t0: number
+  if ((u == 1.0)) {
+    _t0 = x
+  } else {
+    _t0 = (Math.log(u) * (x / (u - 1.0)))
+  }
+  return _t0
+}
+
 function symlogTransform(x: number, c: number): number {
-  return ((((Math.sign(x)) | 0)) * Math.log((1.0 + Math.abs((x / c)))))
+  return ((((Math.sign(x)) | 0)) * log1pf(Math.abs((x / c))))
 }
 
 function normalizeScore(score: number, domainMin: number, domainMax: number, scaleType: number, symlogConstant: number): number {
+  let tMax: number
+  let tMin: number
+  let t: number
   if ((scaleType == 2)) {
-    let tMin = symlogTransform(domainMin, symlogConstant)
-    let tRange = (symlogTransform(domainMax, symlogConstant) - tMin)
-    if ((tRange <= 0.0)) {
-      return 0.0
+    let _t0 = symlogTransform(score, symlogConstant)
+    let _t1 = symlogTransform(domainMin, symlogConstant)
+    tMax = symlogTransform(domainMax, symlogConstant)
+    tMin = _t1
+    t = _t0
+  } else {
+    if ((scaleType == 1)) {
+      if ((domainMin > 0.0)) {
+        tMax = domainMin
+      } else {
+        tMax = 1.0
+      }
+      let _t2 = Math.log2(_max(score, tMax))
+      let _t3 = Math.log2(tMax)
+      tMax = Math.log2(_max(domainMax, tMax))
+      tMin = _t3
+      t = _t2
+    } else {
+      tMax = domainMax
+      tMin = domainMin
+      t = score
     }
-    return _clamp(((symlogTransform(score, symlogConstant) - tMin) / tRange), 0.0, 1.0)
   }
-  if ((scaleType == 1)) {
-    let floorV: number
-    if ((domainMin > 0.0)) {
-      floorV = domainMin
+  let tRange = (tMax - tMin)
+  if ((tRange <= 0.0)) {
+    if ((t > tMin)) {
+      tMax = 1.0
     } else {
-      floorV = 1.0
-    }
-    let logMin = Math.log2(floorV)
-    let logRange = (Math.log2(_max(domainMax, floorV)) - logMin)
-    if ((logRange <= 0.0)) {
-      return 0.0
+      tMax = 0.0
     }
-    return _clamp(((Math.log2(_max(score, floorV)) - logMin) / logRange), 0.0, 1.0)
+    return tMax
   }
-  let range = (domainMax - domainMin)
-  if ((range <= 0.0)) {
-    return 0.0
-  }
-  return _clamp(((score - domainMin) / range), 0.0, 1.0)
+  return _clamp(((t - tMin) / tRange), 0.0, 1.0)
 }
 
-export function valueToYPx(value: number, domainMin: number, domainMax: number, h: number): number {
-  return ((1.0 - _clamp(((value - domainMin) / _max((domainMax - domainMin), 9.99999997475242708e-07)), 0.0, 1.0)) * h)
+export function valueToYPxScaled(value: number, domainMin: number, domainMax: number, h: number, scaleType: number): number {
+  return ((1.0 - normalizeScore(value, domainMin, domainMax, scaleType, 1.0)) * h)
 }
 
-export function valueToYPxScaled(value: number, domainMin: number, domainMax: number, h: number, scaleType: number): number {
-  if ((scaleType == 1)) {
-    return ((1.0 - normalizeScore(value, domainMin, domainMax, 1, 1.0)) * h)
-  }
-  return valueToYPx(value, domainMin, domainMax, h)
+export function pointYPx(value: number, domainMin: number, domainMax: number, h: number, scaleType: number, insetPx: number): number {
+  let _t0 = _min(insetPx, (h * 0.5))
+  return (_t0 + valueToYPxScaled(value, domainMin, domainMax, (h - (2.0 * _t0)), scaleType))
 }
 
 export function pointDrawsBar(spanPx: number, radiusPx: number): boolean {

package/src/shaders/pointMark.slang

@@ -1,5 +1,5 @@
 // The `point` mark shape: one glyph per instance, placed at a genomic x and at
-// a y read off a per-instance value through a linear domain scale. The glyph
+// a y read off a per-instance value through `valueScale`. The glyph
 // channel picks between a disc, an inverted triangle and a diamond, and an
 // instance whose x..x2 extent is wider than the glyph draws as a horizontal bar
 // instead — the shape's own answer to "this datum has extent".
@@ -7,9 +7,8 @@
 // All four are a 6-vertex quad; the fragment shader carves the shape.
 //! targets: wgsl, glsl
 //! export-consts: DIAMOND_GLYPH_SCALE, GLYPH_DISC, GLYPH_TRIANGLE, GLYPH_DIAMOND
-//! js-export: valueToYPx, valueToYPxScaled, pointDrawsBar
-// `valueToYPx` is `valueScale`'s; it is lifted here, once, for every consumer
-// of the scale — the bar shape's painter and hit test import this twin too.
+//! js-export: valueToYPxScaled, pointDrawsBar, pointYPx
+// `valueScale`'s twin is lifted here, once, for the bar shape too.
 
 import antialias;
 import hpmath;
@@ -26,6 +25,7 @@ struct PointMarkInstance {
   float y     : ATTR2;
   uint  color : ATTR3;
   uint  glyph : ATTR4;
+  uint  row   : ATTR5;
 };
 
 struct Uniforms {
@@ -43,6 +43,12 @@ struct Uniforms {
   float  zero;
   float  viewportWidth;
   float  radiusPx;
+  // CSS px per row band, the value scale ruling each on its own; the canvas
+  // height where every instance is on row 0 (ADR-126).
+  float  rowHeight;
+  // Ends of the value range, inset by `glyphPaint`'s `pointInsetPx` where the
+  // display wants its edge glyphs whole; 0 centres a point on the plot's edge.
+  float  insetPx;
   // Read by the glyph pad alone; every other length in this block is CSS px.
   float  devicePixelRatio;
 };
@@ -92,6 +98,13 @@ static const float INV_SQRT5 = 0.4472136;
 // colour swap. LocusZoom's lead-SNP convention, generalized.
 static const float DIAMOND_GLYPH_SCALE = 1.6;
 
+// The shape's own placement: the vertex branch, the Canvas2D painter, the ink
+// box and the hit test all read a value's y through this.
+float pointYPx(float value, float domainMin, float domainMax, float h, int scaleType, float insetPx) {
+  float inset = min(insetPx, h * 0.5);
+  return inset + valueToYPxScaled(value, domainMin, domainMax, h - 2.0 * inset, scaleType);
+}
+
 // The glyph channel's values. The numbering is a contract between whatever
 // packs the channel, the Canvas2D painter and the branches below, so it is
 // authored once here and `//! export-consts`ed.
@@ -110,7 +123,7 @@ VsOut vs_main(PointMarkInstance inst, uint vid : SV_VertexID) {
 
   float startClipX = bpToClipX(inst.x, u);
   float endClipX = bpToClipX(inst.x2, u);
-  float yPx = valueToYPxScaled(inst.y, u.domainMin, u.domainMax, u.canvasHeight, u.valueScaleType);
+  float yPx = u.rowHeight * float(inst.row) + pointYPx(inst.y, u.domainMin, u.domainMax, u.rowHeight, u.valueScaleType, u.insetPx);
   float centerClipY = yPxToClipY(yPx, u.canvasHeight);
 
   // Genomic span in CSS px (clip width spans -1..1 across viewportWidth).

package/src/shaders/pointMark.wgsl.generated.ts

@@ -0,0 +1,4 @@
+// AUTO-GENERATED by packages/shader-tools/src/shader-codegen from pointMark.slang.
+// Do not edit. Run `pnpm gen:shaders` to regenerate.
+
+export const WGSL_SOURCE = "struct Uniforms_std140_0\n{\n    @align(16) bpRangeX_0 : vec3<f32>,\n    @align(4) canvasHeight_0 : f32,\n    @align(16) domainMin_0 : f32,\n    @align(4) domainMax_0 : f32,\n    @align(8) valueScaleType_0 : i32,\n    @align(4) rampMode_0 : i32,\n    @align(16) rampMin_0 : f32,\n    @align(4) rampMax_0 : f32,\n    @align(8) zero_0 : f32,\n    @align(4) viewportWidth_0 : f32,\n    @align(16) radiusPx_0 : f32,\n    @align(4) rowHeight_0 : f32,\n    @align(8) insetPx_0 : f32,\n    @align(4) devicePixelRatio_0 : f32,\n};\n\n@binding(1) @group(0) var<uniform> u_0 : Uniforms_std140_0;\n@binding(2) @group(0) var colorRamp_texture_0 : texture_2d<f32>;\n\n@binding(3) @group(0) var colorRamp_sampler_0 : sampler;\n\nfn quadLocal_0( vid_0 : u32) -> vec2<f32>\n{\n    var v_0 : u32 = vid_0 % u32(6);\n    var _S1 : bool = v_0 == u32(0);\n    var _S2 : bool;\n    if(_S1)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(2);\n    }\n    if(_S2)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(3);\n    }\n    var _S3 : f32;\n    if(_S2)\n    {\n        _S3 = 0.0f;\n    }\n    else\n    {\n        _S3 = 1.0f;\n    }\n    if(_S1)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(1);\n    }\n    if(_S2)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(4);\n    }\n    var _S4 : f32;\n    if(_S2)\n    {\n        _S4 = 0.0f;\n    }\n    else\n    {\n        _S4 = 1.0f;\n    }\n    return vec2<f32>(_S3, _S4);\n}\n\nfn hpSplitUint_0( value_0 : u32) -> vec2<f32>\n{\n    var lo_0 : u32 = (value_0 & (u32(4095)));\n    return vec2<f32>(f32(value_0 - lo_0), f32(lo_0));\n}\n\nfn hpToClipX_0( splitPos_0 : vec2<f32>,  bpRange_0 : vec3<f32>,  hpZero_0 : f32) -> f32\n{\n    var step_0 : f32 = 2.0f / bpRange_0.z;\n    var _S5 : f32 = - (1.0f / hpZero_0);\n    return dot(vec3<f32>(-1.0f, max(splitPos_0.x - bpRange_0.x, _S5), max(splitPos_0.y - bpRange_0.y, _S5)), vec3<f32>(1.0f, step_0, step_0));\n}\n\nfn bpToClipX_0( bp_0 : u32,  u_1 : ptr<function, Uniforms_std140_0>) -> f32\n{\n    return hpToClipX_0(hpSplitUint_0(bp_0), (*u_1).bpRangeX_0, (*u_1).zero_0);\n}\n\nfn log1pf_0( x_0 : f32) -> f32\n{\n    var u_2 : f32 = 1.0f + x_0;\n    var _S6 : f32;\n    if(u_2 == 1.0f)\n    {\n        _S6 = x_0;\n    }\n    else\n    {\n        _S6 = log(u_2) * (x_0 / (u_2 - 1.0f));\n    }\n    return _S6;\n}\n\nfn symlogTransform_0( x_1 : f32,  c_0 : f32) -> f32\n{\n    return f32((i32(sign((x_1))))) * log1pf_0(abs(x_1 / c_0));\n}\n\nfn normalizeScore_0( score_0 : f32,  domainMin_1 : f32,  domainMax_1 : f32,  scaleType_0 : i32,  symlogConstant_0 : f32) -> f32\n{\n    var tMax_0 : f32;\n    var tMin_0 : f32;\n    var t_0 : f32;\n    if(scaleType_0 == i32(2))\n    {\n        var _S7 : f32 = symlogTransform_0(score_0, symlogConstant_0);\n        var _S8 : f32 = symlogTransform_0(domainMin_1, symlogConstant_0);\n        tMax_0 = symlogTransform_0(domainMax_1, symlogConstant_0);\n        tMin_0 = _S8;\n        t_0 = _S7;\n    }\n    else\n    {\n        if(scaleType_0 == i32(1))\n        {\n            if(domainMin_1 > 0.0f)\n            {\n                tMax_0 = domainMin_1;\n            }\n            else\n            {\n                tMax_0 = 1.0f;\n            }\n            var _S9 : f32 = log2(max(score_0, tMax_0));\n            var _S10 : f32 = log2(tMax_0);\n            tMax_0 = log2(max(domainMax_1, tMax_0));\n            tMin_0 = _S10;\n            t_0 = _S9;\n        }\n        else\n        {\n            tMax_0 = domainMax_1;\n            tMin_0 = domainMin_1;\n            t_0 = score_0;\n        }\n    }\n    var tRange_0 : f32 = tMax_0 - tMin_0;\n    if(tRange_0 <= 0.0f)\n    {\n        if(t_0 > tMin_0)\n        {\n            tMax_0 = 1.0f;\n        }\n        else\n        {\n            tMax_0 = 0.0f;\n        }\n        return tMax_0;\n    }\n    return clamp((t_0 - tMin_0) / tRange_0, 0.0f, 1.0f);\n}\n\nfn valueToYPxScaled_0( value_1 : f32,  domainMin_2 : f32,  domainMax_2 : f32,  h_0 : f32,  scaleType_1 : i32) -> f32\n{\n    return (1.0f - normalizeScore_0(value_1, domainMin_2, domainMax_2, scaleType_1, 1.0f)) * h_0;\n}\n\nfn pointYPx_0( value_2 : f32,  domainMin_3 : f32,  domainMax_3 : f32,  h_1 : f32,  scaleType_2 : i32,  insetPx_1 : f32) -> f32\n{\n    var _S11 : f32 = min(insetPx_1, h_1 * 0.5f);\n    return _S11 + valueToYPxScaled_0(value_2, domainMin_3, domainMax_3, h_1 - 2.0f * _S11, scaleType_2);\n}\n\nfn yPxToClipY_0( yPx_0 : f32,  canvasHeight_1 : f32) -> f32\n{\n    return 1.0f - yPx_0 / canvasHeight_1 * 2.0f;\n}\n\nfn clipLenToPx_0( clipLen_0 : f32,  size_0 : f32) -> f32\n{\n    return clipLen_0 * 0.5f * size_0;\n}\n\nfn pointDrawsBar_0( spanPx_0 : f32,  radiusPx_1 : f32) -> bool\n{\n    return spanPx_0 > (radiusPx_1 * 2.0f);\n}\n\nfn unpackRGBA_0( c_1 : u32) -> vec4<f32>\n{\n    return vec4<f32>(f32((((c_1 >> (u32(0)))) & (u32(255)))), f32((((c_1 >> (u32(8)))) & (u32(255)))), f32((((c_1 >> (u32(16)))) & (u32(255)))), f32((((c_1 >> (u32(24)))) & (u32(255))))) / vec4<f32>(255.0f);\n}\n\nfn rampColor_0( ramp_texture_0 : texture_2d<f32>,  ramp_sampler_0 : sampler,  t_1 : f32) -> vec4<f32>\n{\n    return (textureSampleLevel((ramp_texture_0), (ramp_sampler_0), (vec2<f32>((clamp(t_1, 0.0f, 1.0f) * 255.0f + 0.5f) / 256.0f, 0.5f)), (0.0f)));\n}\n\nfn markInstanceColor_0( ramp_texture_1 : texture_2d<f32>,  ramp_sampler_1 : sampler,  packed_0 : u32,  rampMode_1 : i32,  rampMin_1 : f32,  rampMax_1 : f32) -> vec4<f32>\n{\n    if(rampMode_1 == i32(0))\n    {\n        return unpackRGBA_0(packed_0);\n    }\n    var scaleType_3 : i32;\n    if(rampMode_1 == i32(2))\n    {\n        scaleType_3 = i32(1);\n    }\n    else\n    {\n        scaleType_3 = i32(0);\n    }\n    return rampColor_0(ramp_texture_1, ramp_sampler_1, normalizeScore_0((bitcast<f32>((packed_0))), rampMin_1, rampMax_1, scaleType_3, 1.0f));\n}\n\nfn pxToClipLen_0( px_0 : f32,  size_1 : f32) -> f32\n{\n    return px_0 * 2.0f / size_1;\n}\n\nfn clipXToPx_0( clipX_0 : f32,  canvasWidth_0 : f32) -> f32\n{\n    return (clipX_0 + 1.0f) * 0.5f * canvasWidth_0;\n}\n\nfn crispSquareTopLeftPx_0( centerPx_0 : f32,  diameterPx_0 : f32) -> f32\n{\n    return floor(centerPx_0 - diameterPx_0 * 0.5f + 0.5f);\n}\n\nfn crispSquareCornerPx_0( centerPx_1 : vec2<f32>,  diameterPx_1 : f32,  q_0 : vec2<f32>) -> vec2<f32>\n{\n    return vec2<f32>(crispSquareTopLeftPx_0(centerPx_1.x, diameterPx_1), crispSquareTopLeftPx_0(centerPx_1.y, diameterPx_1)) + q_0 * vec2<f32>(diameterPx_1);\n}\n\nfn pxToClipX_0( xPx_0 : f32,  canvasWidth_1 : f32) -> f32\n{\n    return xPx_0 / canvasWidth_1 * 2.0f - 1.0f;\n}\n\nfn crispSquareCornerClip_0( centerClipX_0 : f32,  centerYPx_0 : f32,  diameterPx_2 : f32,  q_1 : vec2<f32>,  viewportWidth_1 : f32,  canvasHeight_2 : f32) -> vec4<f32>\n{\n    var vPx_0 : vec2<f32> = crispSquareCornerPx_0(vec2<f32>(clipXToPx_0(centerClipX_0, viewportWidth_1), centerYPx_0), diameterPx_2, q_1);\n    return vec4<f32>(pxToClipX_0(vPx_0.x, viewportWidth_1), yPxToClipY_0(vPx_0.y, canvasHeight_2), 0.0f, 1.0f);\n}\n\nfn aaPx_0( dpr_0 : f32) -> f32\n{\n    return 1.0f / max(dpr_0, 1.0f);\n}\n\nfn aaHalfPx_0( dpr_1 : f32) -> f32\n{\n    return 0.5f * aaPx_0(dpr_1);\n}\n\nfn discExpand_0( radiusPx_2 : f32,  dpr_2 : f32) -> f32\n{\n    return (radiusPx_2 + aaHalfPx_0(dpr_2)) / max(radiusPx_2, 0.5f);\n}\n\nstruct VsOut_0\n{\n    @builtin(position) position_0 : vec4<f32>,\n    @location(0) color_0 : vec4<f32>,\n    @location(2) localPos_0 : vec2<f32>,\n    @interpolate(flat) @location(1) shape_0 : f32,\n};\n\nstruct vertexInput_0\n{\n    @location(0) x_2 : u32,\n    @location(1) x2_0 : u32,\n    @location(2) y_0 : f32,\n    @location(3) color_1 : u32,\n    @location(4) glyph_0 : u32,\n    @location(5) row_0 : u32,\n};\n\n@vertex\nfn vs_main( _S12 : vertexInput_0, @builtin(vertex_index) vid_1 : u32) -> VsOut_0\n{\n    var q_2 : vec2<f32> = quadLocal_0(vid_1 % u32(6));\n    var local_0 : vec2<f32> = q_2 * vec2<f32>(2.0f) - vec2<f32>(1.0f);\n    var xZero_0 : bool = (q_2.x) < 0.5f;\n    var _S13 : Uniforms_std140_0 = u_0;\n    var _S14 : f32 = bpToClipX_0(_S12.x_2, &(_S13));\n    var _S15 : f32 = bpToClipX_0(_S12.x2_0, &(_S13));\n    var yPx_1 : f32 = u_0.rowHeight_0 * f32(_S12.row_0) + pointYPx_0(_S12.y_0, u_0.domainMin_0, u_0.domainMax_0, u_0.rowHeight_0, u_0.valueScaleType_0, u_0.insetPx_0);\n    var centerClipY_0 : f32 = yPxToClipY_0(yPx_1, u_0.canvasHeight_0);\n    var isBar_0 : bool = pointDrawsBar_0(clipLenToPx_0(abs(_S15 - _S14), u_0.viewportWidth_0), u_0.radiusPx_0);\n    var o_0 : VsOut_0;\n    o_0.color_0 = markInstanceColor_0(colorRamp_texture_0, colorRamp_sampler_0, _S12.color_1, u_0.rampMode_0, u_0.rampMin_0, u_0.rampMax_0);\n    var x_3 : f32;\n    if(isBar_0)\n    {\n        if(xZero_0)\n        {\n            x_3 = min(_S14, _S15);\n        }\n        else\n        {\n            x_3 = max(_S14, _S15);\n        }\n        o_0.position_0 = vec4<f32>(x_3, centerClipY_0 + pxToClipLen_0(local_0.y * u_0.radiusPx_0, u_0.canvasHeight_0), 0.0f, 1.0f);\n        o_0.localPos_0 = local_0;\n        o_0.shape_0 = 3.0f;\n    }\n    else\n    {\n        var _S16 : bool;\n        if((_S12.glyph_0) == u32(0))\n        {\n            _S16 = (u_0.radiusPx_0 * 2.0f) <= 3.0f;\n        }\n        else\n        {\n            _S16 = false;\n        }\n        if(_S16)\n        {\n            o_0.position_0 = crispSquareCornerClip_0(_S14, yPx_1, u_0.radiusPx_0 * 2.0f, q_2, u_0.viewportWidth_0, u_0.canvasHeight_0);\n            o_0.localPos_0 = local_0;\n            o_0.shape_0 = 3.0f;\n        }\n        else\n        {\n            var expand_0 : f32 = discExpand_0(u_0.radiusPx_0, u_0.devicePixelRatio_0);\n            var _S17 : bool = (_S12.glyph_0) == u32(2);\n            if(_S17)\n            {\n                x_3 = 1.60000002384185791f;\n            }\n            else\n            {\n                x_3 = 1.0f;\n            }\n            var halfPx_0 : f32 = u_0.radiusPx_0 * expand_0 * x_3;\n            o_0.position_0 = vec4<f32>(_S14 + pxToClipLen_0(local_0.x * halfPx_0, u_0.viewportWidth_0), centerClipY_0 + pxToClipLen_0(local_0.y * halfPx_0, u_0.canvasHeight_0), 0.0f, 1.0f);\n            o_0.localPos_0 = local_0 * vec2<f32>(expand_0);\n            if((_S12.glyph_0) == u32(1))\n            {\n                x_3 = 2.0f;\n            }\n            else\n            {\n                if(_S17)\n                {\n                    x_3 = 1.0f;\n                }\n                else\n                {\n                    x_3 = 0.0f;\n                }\n            }\n            o_0.shape_0 = x_3;\n        }\n    }\n    return o_0;\n}\n\nfn discCoverage_0( localPos_1 : vec2<f32>) -> f32\n{\n    return 1.0f - length(localPos_1);\n}\n\nfn aaGradient_0( d_0 : f32) -> f32\n{\n    return max(length(vec2<f32>(dpdx(d_0), dpdy(d_0))), 0.00000999999974738f);\n}\n\nfn aaRamp_0( signedInk_0 : f32,  widthPx_0 : f32) -> f32\n{\n    return clamp(signedInk_0 / widthPx_0 + 0.5f, 0.0f, 1.0f);\n}\n\nfn glyphEdgeAlpha_0( coverage_0 : f32) -> f32\n{\n    return aaRamp_0(coverage_0, aaGradient_0(coverage_0));\n}\n\nstruct pixelOutput_0\n{\n    @location(0) output_0 : vec4<f32>,\n};\n\nstruct pixelInput_0\n{\n    @location(0) color_2 : vec4<f32>,\n    @location(2) localPos_2 : vec2<f32>,\n    @interpolate(flat) @location(1) shape_1 : f32,\n};\n\n@fragment\nfn fs_main( _S18 : pixelInput_0, @builtin(position) position_1 : vec4<f32>) -> pixelOutput_0\n{\n    var coverage_1 : f32;\n    if((_S18.shape_1) > 2.5f)\n    {\n        coverage_1 = 1.0f;\n    }\n    else\n    {\n        if((_S18.shape_1) > 1.5f)\n        {\n            var _S19 : f32 = _S18.localPos_2.y;\n            var _S20 : f32 = _S18.localPos_2.x;\n            coverage_1 = min(1.0f - _S19, min((2.0f * _S20 + _S19 + 1.0f) * 0.44721359014511108f, (-2.0f * _S20 + _S19 + 1.0f) * 0.44721359014511108f));\n        }\n        else\n        {\n            if((_S18.shape_1) > 0.5f)\n            {\n                coverage_1 = 1.0f - (abs(_S18.localPos_2.x) + abs(_S18.localPos_2.y));\n            }\n            else\n            {\n                coverage_1 = discCoverage_0(_S18.localPos_2);\n            }\n        }\n    }\n    var alpha_0 : f32 = glyphEdgeAlpha_0(coverage_1);\n    if(alpha_0 <= 0.0f)\n    {\n        discard;\n    }\n    var _S21 : pixelOutput_0 = pixelOutput_0( vec4<f32>(_S18.color_2.xyz, _S18.color_2.w * alpha_0) );\n    return _S21;\n}\n\n"

package/src/shaders/scoreScale.js.generated.ts

@@ -16,36 +16,57 @@ function _min(a: number, b: number) {
   return b < a || Number.isNaN(a) ? b : a
 }
 
+function log1pf(x: number): number {
+  let u = (1.0 + x)
+  let _t0: number
+  if ((u == 1.0)) {
+    _t0 = x
+  } else {
+    _t0 = (Math.log(u) * (x / (u - 1.0)))
+  }
+  return _t0
+}
+
 function symlogTransform(x: number, c: number): number {
-  return ((((Math.sign(x)) | 0)) * Math.log((1.0 + Math.abs((x / c)))))
+  return ((((Math.sign(x)) | 0)) * log1pf(Math.abs((x / c))))
 }
 
 export function normalizeScore(score: number, domainMin: number, domainMax: number, scaleType: number, symlogConstant: number): number {
+  let tMax: number
+  let tMin: number
+  let t: number
   if ((scaleType == 2)) {
-    let tMin = symlogTransform(domainMin, symlogConstant)
-    let tRange = (symlogTransform(domainMax, symlogConstant) - tMin)
-    if ((tRange <= 0.0)) {
-      return 0.0
+    let _t0 = symlogTransform(score, symlogConstant)
+    let _t1 = symlogTransform(domainMin, symlogConstant)
+    tMax = symlogTransform(domainMax, symlogConstant)
+    tMin = _t1
+    t = _t0
+  } else {
+    if ((scaleType == 1)) {
+      if ((domainMin > 0.0)) {
+        tMax = domainMin
+      } else {
+        tMax = 1.0
+      }
+      let _t2 = Math.log2(_max(score, tMax))
+      let _t3 = Math.log2(tMax)
+      tMax = Math.log2(_max(domainMax, tMax))
+      tMin = _t3
+      t = _t2
+    } else {
+      tMax = domainMax
+      tMin = domainMin
+      t = score
     }
-    return _clamp(((symlogTransform(score, symlogConstant) - tMin) / tRange), 0.0, 1.0)
   }
-  if ((scaleType == 1)) {
-    let floorV: number
-    if ((domainMin > 0.0)) {
-      floorV = domainMin
+  let tRange = (tMax - tMin)
+  if ((tRange <= 0.0)) {
+    if ((t > tMin)) {
+      tMax = 1.0
     } else {
-      floorV = 1.0
-    }
-    let logMin = Math.log2(floorV)
-    let logRange = (Math.log2(_max(domainMax, floorV)) - logMin)
-    if ((logRange <= 0.0)) {
-      return 0.0
+      tMax = 0.0
     }
-    return _clamp(((Math.log2(_max(score, floorV)) - logMin) / logRange), 0.0, 1.0)
-  }
-  let range = (domainMax - domainMin)
-  if ((range <= 0.0)) {
-    return 0.0
+    return tMax
   }
-  return _clamp(((score - domainMin) / range), 0.0, 1.0)
+  return _clamp(((t - tMin) / tRange), 0.0, 1.0)
 }

package/src/shaders/scoreScale.slang

@@ -1,69 +1,53 @@
-// The score → [0,1] normalizer every score-scaled track is placed by, and the
-// scale-type vocabulary its branches switch on.
+// The score → [0,1] normalizer every score-scaled mark is placed and coloured
+// by — wiggle, the coverage band, the bar and point shapes, their ramps — and
+// the scale-type vocabulary its branches switch on. `makeScoreNormalizer`
+// (render-core's scoreScale.ts) is its loop-hoisted twin.
 //
-// Two real consumers with non-obvious math, which is ADR-040's bar: the wiggle
-// renderer's four modes (`wiggleCommon.slang`, via `scoreToY`) and the coverage
-// band's depth axis (`coverageBand.slang`, via `normalizeDepthScalar`). They
-// carried a branch-for-branch copy each, and the copies did not agree: the
-// coverage one compared `scaleType` against bare 2 and 1 rather than the
-// constants below, and answered 0 on a degenerate domain where wiggle's divided
-// by a 1e-6 floor and saturated. This module is one answer to both.
-//
-// The degenerate domain answers 0, which is what the JS twin
-// (`makeScoreNormalizer`, packages/wiggle-core/src/normalize.ts) has always
-// answered. Returning 0 avoids the NaN the 1e-6 floor was there for just as
-// well, so the divergence bought nothing and cost a documented exception.
-//
-// `SCALE_TYPE_LINEAR` is deliberately absent: it is "neither of these", and a
-// third constant would be a value nothing compares against.
+// A domain with no range is a step: a score above its min maps to 1 and any
+// other to 0, so a score above a pinned domain sits off the top everywhere.
 //! export-consts: SCALE_TYPE_LOG, SCALE_TYPE_SYMLOG
 //! js-export: normalizeScore
-//! js-skip: symlogTransform — the JS twin (wiggle-core normalize.ts) spells it Math.log1p, which is accurate near zero where the shader's log(1.0 + x) is not; a generated twin would be a faithful copy of the worse of the two. What both backends must agree on is normalizeScore, which is exported and swept by normalizeScoreParity.test.ts
+//! js-skip: log1pf — JS has Math.log1p, so a twin of this would be the float32 workaround spelled out where the language already answers it
+//! js-skip: symlogTransform — render-core scoreScale.ts reaches Math.log1p directly, one call inside a normalizer it hoists the whole log domain out of, so a per-call twin of this would have no caller. What both backends must agree on is normalizeScore, which is exported and swept by normalizeScoreParity.test.ts
 module scoreScale;
 
-// The values the `scaleType` uniform is compared against. Emitted into
-// @jbrowse/wiggle-core through `wiggleCommon.slang`'s `export-consts` — the
-// constant evaluator resolves through imports, and wiggle-core is where
-// `WiggleScaleType` is declared, so the numbers stay next to the type they
-// name rather than next to the module that happens to author them.
+// `ScaleTypeCode` in scoreScale.ts is these two and 0, for linear.
 public static const int SCALE_TYPE_LOG = 1;
 public static const int SCALE_TYPE_SYMLOG = 2;
 
+// log(1 + x) for x that `1.0 + x` rounds away: a symlog domain narrower than
+// its constant lands entirely in that region, and in float32 the rounding
+// survives the normalize's divide by a tiny domain range — 0.2px of a 40px row
+// on domain [-1, 0.75] with constant 100.5, against the Canvas2D twin's
+// Math.log1p. Kahan's identity: `u - 1.0` is exact where `u` is near 1, so the
+// ratio is the correction the sum lost.
+float log1pf(float x) {
+  float u = 1.0 + x;
+  return u == 1.0 ? x : log(u) * (x / (u - 1.0));
+}
+
 public float symlogTransform(float x, float c) {
-  return sign(x) * log(1.0 + abs(x / c));
+  return sign(x) * log1pf(abs(x / c));
 }
 
 public float normalizeScore(float score, float domainMin, float domainMax, int scaleType, float symlogConstant) {
+  float t = score;
+  float tMin = domainMin;
+  float tMax = domainMax;
   if (scaleType == SCALE_TYPE_SYMLOG) {
-    // Defined at and either side of zero, so unlike the log branch there is
-    // nothing to floor: the domain arrives as-is and 0 lands where it belongs
-    // instead of on the baseline with everything else below the floor. On a
-    // coverage band that is the whole reason symlog is offered — a depth of 0
-    // is real, common, and what log cannot separate from a depth of 1.
-    float tMin = symlogTransform(domainMin, symlogConstant);
-    float tMax = symlogTransform(domainMax, symlogConstant);
-    float tRange = tMax - tMin;
-    if (tRange <= 0.0) { return 0.0; }
-    float t = symlogTransform(score, symlogConstant);
-    return clamp((t - tMin) / tRange, 0.0, 1.0);
-  }
-  if (scaleType == SCALE_TYPE_LOG) {
-    // Floor at the domain's own min, not at 1, so a domain sitting entirely
-    // below 1 (mappability, a methylation fraction, any normalized ratio) still
-    // has a range to spread over instead of collapsing to a flat baseline. Same
-    // rule and same reasoning as JS `makeScoreNormalizer`, which keeps its own
-    // hand-written copy because it hoists this arithmetic out of a per-feature
-    // loop — so this one is `//! js-export`ed as the ORACLE the two are swept
-    // against (`normalizeScoreParity.test.ts`), not to retire it.
+    t = symlogTransform(score, symlogConstant);
+    tMin = symlogTransform(domainMin, symlogConstant);
+    tMax = symlogTransform(domainMax, symlogConstant);
+  } else if (scaleType == SCALE_TYPE_LOG) {
+    // The domain's own min, so a domain entirely below 1 still spreads.
     float floorV = domainMin > 0.0 ? domainMin : 1.0;
-    float logMin = log2(floorV);
-    float logMax = log2(max(domainMax, floorV));
-    float logRange = logMax - logMin;
-    if (logRange <= 0.0) { return 0.0; }
-    float logScore = log2(max(score, floorV));
-    return clamp((logScore - logMin) / logRange, 0.0, 1.0);
+    t = log2(max(score, floorV));
+    tMin = log2(floorV);
+    tMax = log2(max(domainMax, floorV));
+  }
+  float tRange = tMax - tMin;
+  if (tRange <= 0.0) {
+    return t > tMin ? 1.0 : 0.0;
   }
-  float range = domainMax - domainMin;
-  if (range <= 0.0) { return 0.0; }
-  return clamp((score - domainMin) / range, 0.0, 1.0);
+  return clamp((t - tMin) / tRange, 0.0, 1.0);
 }

package/src/shaders/spanMark.generated.ts

@@ -1,10 +1,11 @@
 // AUTO-GENERATED by packages/shader-tools/src/shader-codegen from spanMark.slang.
 // Do not edit. Run `pnpm gen:shaders` to regenerate.
 
-export const WGSL_SOURCE = "struct RowRectUniforms_std140_0\n{\n    @align(16) bpRangeX_0 : vec3<f32>,\n    @align(4) canvasHeight_0 : f32,\n    @align(16) minCellDenomPx_0 : f32,\n    @align(4) minCellPx_0 : f32,\n    @align(8) zero_0 : f32,\n    @align(4) rowHeight_0 : f32,\n    @align(16) rowProportion_0 : f32,\n    @align(4) scrollTop_0 : f32,\n};\n\n@binding(1) @group(0) var<uniform> u_0 : RowRectUniforms_std140_0;\nfn quadLocal_0( vid_0 : u32) -> vec2<f32>\n{\n    var v_0 : u32 = vid_0 % u32(6);\n    var _S1 : bool = v_0 == u32(0);\n    var _S2 : bool;\n    if(_S1)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(2);\n    }\n    if(_S2)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(3);\n    }\n    var _S3 : f32;\n    if(_S2)\n    {\n        _S3 = 0.0f;\n    }\n    else\n    {\n        _S3 = 1.0f;\n    }\n    if(_S1)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(1);\n    }\n    if(_S2)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(4);\n    }\n    var _S4 : f32;\n    if(_S2)\n    {\n        _S4 = 0.0f;\n    }\n    else\n    {\n        _S4 = 1.0f;\n    }\n    return vec2<f32>(_S3, _S4);\n}\n\nfn drawnRowHeightPx_0( rowHeight_1 : f32,  rowProportion_1 : f32) -> f32\n{\n    return max(rowHeight_1 * rowProportion_1, 1.0f);\n}\n\nfn rowBandOffsetPx_0( rowHeight_2 : f32,  rowProportion_2 : f32) -> f32\n{\n    return (rowHeight_2 - drawnRowHeightPx_0(rowHeight_2, rowProportion_2)) * 0.5f;\n}\n\nstruct RowBand_0\n{\n     height_0 : f32,\n     offset_0 : f32,\n};\n\nfn rowBandPx_0( rowHeight_3 : f32,  rowProportion_3 : f32) -> RowBand_0\n{\n    var band_0 : RowBand_0;\n    band_0.height_0 = drawnRowHeightPx_0(rowHeight_3, rowProportion_3);\n    band_0.offset_0 = rowBandOffsetPx_0(rowHeight_3, rowProportion_3);\n    return band_0;\n}\n\nfn hpSplitUint_0( value_0 : u32) -> vec2<f32>\n{\n    var lo_0 : u32 = (value_0 & (u32(4095)));\n    return vec2<f32>(f32(value_0 - lo_0), f32(lo_0));\n}\n\nfn hpToClipX_0( splitPos_0 : vec2<f32>,  bpRange_0 : vec3<f32>,  hpZero_0 : f32) -> f32\n{\n    var step_0 : f32 = 2.0f / bpRange_0.z;\n    var _S5 : f32 = - (1.0f / hpZero_0);\n    return dot(vec3<f32>(-1.0f, max(splitPos_0.x - bpRange_0.x, _S5), max(splitPos_0.y - bpRange_0.y, _S5)), vec3<f32>(1.0f, step_0, step_0));\n}\n\nfn extendToMinWidthPx_0( x1_0 : f32,  x2_0 : f32,  minWidth_0 : f32) -> f32\n{\n    var dx_0 : f32 = x2_0 - x1_0;\n    var _S6 : f32;\n    if((abs(dx_0)) < minWidth_0)\n    {\n        if(dx_0 < 0.0f)\n        {\n            _S6 = - minWidth_0;\n        }\n        else\n        {\n            _S6 = minWidth_0;\n        }\n        _S6 = x1_0 + _S6;\n    }\n    else\n    {\n        _S6 = x2_0;\n    }\n    return _S6;\n}\n\nfn extendToMinWidthX_0( x1_1 : f32,  x2_1 : f32,  minWidthPx_0 : f32,  canvasWidth_0 : f32) -> f32\n{\n    return extendToMinWidthPx_0(x1_1, x2_1, minWidthPx_0 * 2.0f / canvasWidth_0);\n}\n\nfn yPxToClipY_0( yPx_0 : f32,  canvasHeight_1 : f32) -> f32\n{\n    return 1.0f - yPx_0 / canvasHeight_1 * 2.0f;\n}\n\nfn rowRectClipPos_0( startBp_0 : u32,  endBp_0 : u32,  rowIndex_0 : f32,  vid_1 : u32,  u_1 : ptr<function, RowRectUniforms_std140_0>) -> vec4<f32>\n{\n    var local_0 : vec2<f32> = quadLocal_0(vid_1);\n    var band_1 : RowBand_0 = rowBandPx_0((*u_1).rowHeight_0, (*u_1).rowProportion_0);\n    var rowY_0 : f32 = band_1.offset_0 + (*u_1).rowHeight_0 * rowIndex_0 - (*u_1).scrollTop_0;\n    var sx1_0 : f32 = hpToClipX_0(hpSplitUint_0(startBp_0), (*u_1).bpRangeX_0, (*u_1).zero_0);\n    return vec4<f32>(mix(sx1_0, extendToMinWidthX_0(sx1_0, hpToClipX_0(hpSplitUint_0(endBp_0), (*u_1).bpRangeX_0, (*u_1).zero_0), (*u_1).minCellPx_0, (*u_1).minCellDenomPx_0), local_0.x), yPxToClipY_0(mix(rowY_0, rowY_0 + band_1.height_0, local_0.y), (*u_1).canvasHeight_0), 0.0f, 1.0f);\n}\n\nfn unpackRGBA_0( c_0 : u32) -> vec4<f32>\n{\n    return vec4<f32>(f32((((c_0 >> (u32(0)))) & (u32(255)))), f32((((c_0 >> (u32(8)))) & (u32(255)))), f32((((c_0 >> (u32(16)))) & (u32(255)))), f32((((c_0 >> (u32(24)))) & (u32(255))))) / vec4<f32>(255.0f);\n}\n\nstruct RowRectVsOut_0\n{\n    @builtin(position) position_0 : vec4<f32>,\n    @location(0) color_0 : vec4<f32>,\n};\n\nstruct RowRectInstance_0\n{\n     x_0 : u32,\n     x2_2 : u32,\n     row_0 : u32,\n     color_1 : u32,\n};\n\nfn rowRectVertex_0( inst_0 : RowRectInstance_0,  vid_2 : u32,  u_2 : ptr<function, RowRectUniforms_std140_0>) -> RowRectVsOut_0\n{\n    var o_0 : RowRectVsOut_0;\n    var _S7 : vec4<f32> = rowRectClipPos_0(inst_0.x_0, inst_0.x2_2, f32(inst_0.row_0), vid_2, &((*u_2)));\n    o_0.position_0 = _S7;\n    o_0.color_0 = unpackRGBA_0(inst_0.color_1);\n    return o_0;\n}\n\nstruct vertexInput_0\n{\n    @location(0) x_1 : u32,\n    @location(1) x2_3 : u32,\n    @location(2) row_1 : u32,\n    @location(3) color_2 : u32,\n};\n\n@vertex\nfn vs_main( _S8 : vertexInput_0, @builtin(vertex_index) vid_3 : u32) -> RowRectVsOut_0\n{\n    var _S9 : RowRectInstance_0 = RowRectInstance_0( _S8.x_1, _S8.x2_3, _S8.row_1, _S8.color_2 );\n    var _S10 : RowRectUniforms_std140_0 = u_0;\n    var _S11 : RowRectVsOut_0 = rowRectVertex_0(_S9, vid_3, &(_S10));\n    return _S11;\n}\n\nstruct pixelOutput_0\n{\n    @location(0) output_0 : vec4<f32>,\n};\n\nstruct pixelInput_0\n{\n    @location(0) color_3 : vec4<f32>,\n};\n\n@fragment\nfn fs_main( _S12 : pixelInput_0, @builtin(position) position_1 : vec4<f32>) -> pixelOutput_0\n{\n    var _S13 : pixelOutput_0 = pixelOutput_0( _S12.color_3 );\n    return _S13;\n}\n\n"
-
-export const GLSL_VERTEX = "#version 300 es\nprecision highp float;\nprecision highp int;\nstruct RowRectUniforms_0\n{\n    vec3 bpRangeX_0;\n    float canvasHeight_0;\n    float minCellDenomPx_0;\n    float minCellPx_0;\n    float zero_0;\n    float rowHeight_0;\n    float rowProportion_0;\n    float scrollTop_0;\n};\n\n\nlayout(std140) uniform Uniforms\n{\n    vec3 bpRangeX_0;\n    float canvasHeight_0;\n    float minCellDenomPx_0;\n    float minCellPx_0;\n    float zero_0;\n    float rowHeight_0;\n    float rowProportion_0;\n    float scrollTop_0;\n}u_0;\n\nvec2 quadLocal_0(uint vid_0)\n{\n\n    uint v_0 = vid_0 % 6U;\n\n    bool _S1 = v_0 == 0U;\n\n    bool _S2;\n\n    if(_S1)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 2U;\n\n    }\n\n    if(_S2)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 3U;\n\n    }\n\n    float _S3;\n\n    if(_S2)\n    {\n\n        _S3 = 0.0;\n\n    }\n    else\n    {\n\n        _S3 = 1.0;\n\n    }\n    if(_S1)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 1U;\n\n    }\n\n    if(_S2)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 4U;\n\n    }\n\n    float _S4;\n\n    if(_S2)\n    {\n\n        _S4 = 0.0;\n\n    }\n    else\n    {\n\n        _S4 = 1.0;\n\n    }\n\n    return vec2(_S3, _S4);\n}\n\n\nfloat drawnRowHeightPx_0(float rowHeight_1, float rowProportion_1)\n{\n\n    return max(rowHeight_1 * rowProportion_1, 1.0);\n}\n\nfloat rowBandOffsetPx_0(float rowHeight_2, float rowProportion_2)\n{\n\n    return (rowHeight_2 - drawnRowHeightPx_0(rowHeight_2, rowProportion_2)) * 0.5;\n}\n\n\nstruct RowBand_0\n{\n    float height_0;\n    float offset_0;\n};\n\n\nRowBand_0 rowBandPx_0(float rowHeight_3, float rowProportion_3)\n{\n\n    RowBand_0 band_0;\n    band_0.height_0 = drawnRowHeightPx_0(rowHeight_3, rowProportion_3);\n    band_0.offset_0 = rowBandOffsetPx_0(rowHeight_3, rowProportion_3);\n    return band_0;\n}\n\n\nvec2 hpSplitUint_0(uint value_0)\n{\n\n    uint lo_0 = value_0 & 4095U;\n\n    return vec2(float(value_0 - lo_0), float(lo_0));\n}\n\n\nfloat hpToClipX_0(vec2 splitPos_0, vec3 bpRange_0, float hpZero_0)\n{\n    float step_0 = 2.0 / bpRange_0.z;\n    float _S5 = - (1.0 / hpZero_0);\n\n    return dot(vec3(-1.0, max(splitPos_0.x - bpRange_0.x, _S5), max(splitPos_0.y - bpRange_0.y, _S5)), vec3(1.0, step_0, step_0));\n}\n\n\nfloat extendToMinWidthPx_0(float x1_0, float x2_0, float minWidth_0)\n{\n\n    float dx_0 = x2_0 - x1_0;\n\n    float _S6;\n    if((abs(dx_0)) < minWidth_0)\n    {\n\n        if(dx_0 < 0.0)\n        {\n\n            _S6 = - minWidth_0;\n\n        }\n        else\n        {\n\n            _S6 = minWidth_0;\n\n        }\n\n        _S6 = x1_0 + _S6;\n\n    }\n    else\n    {\n\n        _S6 = x2_0;\n\n    }\n\n    return _S6;\n}\n\nfloat extendToMinWidthX_0(float x1_1, float x2_1, float minWidthPx_0, float canvasWidth_0)\n{\n\n    return extendToMinWidthPx_0(x1_1, x2_1, minWidthPx_0 * 2.0 / canvasWidth_0);\n}\n\n\nfloat yPxToClipY_0(float yPx_0, float canvasHeight_1)\n{\n\n    return 1.0 - yPx_0 / canvasHeight_1 * 2.0;\n}\n\n\nvec4 rowRectClipPos_0(uint startBp_0, uint endBp_0, float rowIndex_0, uint vid_1, RowRectUniforms_0 u_1)\n{\n\n    vec2 local_0 = quadLocal_0(vid_1);\n\n    RowBand_0 band_1 = rowBandPx_0(u_1.rowHeight_0, u_1.rowProportion_0);\n    float rowY_0 = band_1.offset_0 + u_1.rowHeight_0 * rowIndex_0 - u_1.scrollTop_0;\n\n    float sx1_0 = hpToClipX_0(hpSplitUint_0(startBp_0), u_1.bpRangeX_0, u_1.zero_0);\n\n    return vec4(mix(sx1_0, extendToMinWidthX_0(sx1_0, hpToClipX_0(hpSplitUint_0(endBp_0), u_1.bpRangeX_0, u_1.zero_0), u_1.minCellPx_0, u_1.minCellDenomPx_0), local_0.x), yPxToClipY_0(mix(rowY_0, rowY_0 + band_1.height_0, local_0.y), u_1.canvasHeight_0), 0.0, 1.0);\n}\n\n\nvec4 unpackRGBA_0(uint c_0)\n{\n\n    return vec4(float((c_0 >> 0U) & 255U), float((c_0 >> 8U) & 255U), float((c_0 >> 16U) & 255U), float((c_0 >> 24U) & 255U)) / 255.0;\n}\n\n\nstruct RowRectVsOut_0\n{\n    vec4 position_0;\n    vec4 color_0;\n};\n\n\nstruct RowRectInstance_0\n{\n    uint x_0;\n    uint x2_2;\n    uint row_0;\n    uint color_1;\n};\n\n\nRowRectVsOut_0 rowRectVertex_0(RowRectInstance_0 inst_0, uint vid_2, RowRectUniforms_0 u_2)\n{\n\n    RowRectVsOut_0 o_0;\n    o_0.position_0 = rowRectClipPos_0(inst_0.x_0, inst_0.x2_2, float(inst_0.row_0), vid_2, u_2);\n    o_0.color_0 = unpackRGBA_0(inst_0.color_1);\n    return o_0;\n}\n\n\nout vec4 v_color;\n\n\nlayout(location = 0)\nin uint a_x;\n\n\nlayout(location = 1)\nin uint a_x2;\n\n\nlayout(location = 2)\nin uint a_row;\n\n\nlayout(location = 3)\nin uint a_color;\n\n\nvoid main()\n{\n\n    RowRectUniforms_0 _S7 = RowRectUniforms_0(u_0.bpRangeX_0, u_0.canvasHeight_0, u_0.minCellDenomPx_0, u_0.minCellPx_0, u_0.zero_0, u_0.rowHeight_0, u_0.rowProportion_0, u_0.scrollTop_0);\n\n    RowRectInstance_0 _S8 = RowRectInstance_0(a_x, a_x2, a_row, a_color);\n    RowRectVsOut_0 _S9 = rowRectVertex_0(_S8, uint(gl_VertexID), _S7);\n\n    gl_Position = _S9.position_0;\n\n    v_color = _S9.color_0;\n\n    return;\n}\n\n"
-
-export const GLSL_FRAGMENT = "#version 300 es\nprecision highp float;\nprecision highp int;\nlayout(location = 0)\nout vec4 entryPointParam_fs_main_0;\n\n\nin vec4 v_color;\n\n\nvoid main()\n{\n\n    entryPointParam_fs_main_0 = v_color;\n\n    return;\n}\n\n"
+import type { ShaderSource } from '@jbrowse/render-core/hal'
 
 export * from './spanMark.iface.generated.ts'
+
+export const SOURCE: ShaderSource = {
+  wgsl: () => import('./spanMark.wgsl.generated.ts'),
+  glsl: () => import('./spanMark.glsl.generated.ts'),
+}

package/src/shaders/spanMark.glsl.generated.ts

@@ -0,0 +1,6 @@
+// AUTO-GENERATED by packages/shader-tools/src/shader-codegen from spanMark.slang.
+// Do not edit. Run `pnpm gen:shaders` to regenerate.
+
+export const GLSL_VERTEX = "#version 300 es\nprecision highp float;\nprecision highp int;\nstruct RowRectUniforms_0\n{\n    vec3 bpRangeX_0;\n    float canvasHeight_0;\n    float minCellDenomPx_0;\n    float minCellPx_0;\n    float zero_0;\n    float rowHeight_0;\n    float rowProportion_0;\n    float scrollTop_0;\n};\n\n\nlayout(std140) uniform Uniforms\n{\n    vec3 bpRangeX_0;\n    float canvasHeight_0;\n    float minCellDenomPx_0;\n    float minCellPx_0;\n    float zero_0;\n    float rowHeight_0;\n    float rowProportion_0;\n    float scrollTop_0;\n}u_0;\n\nvec2 quadLocal_0(uint vid_0)\n{\n\n    uint v_0 = vid_0 % 6U;\n\n    bool _S1 = v_0 == 0U;\n\n    bool _S2;\n\n    if(_S1)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 2U;\n\n    }\n\n    if(_S2)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 3U;\n\n    }\n\n    float _S3;\n\n    if(_S2)\n    {\n\n        _S3 = 0.0;\n\n    }\n    else\n    {\n\n        _S3 = 1.0;\n\n    }\n    if(_S1)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 1U;\n\n    }\n\n    if(_S2)\n    {\n\n        _S2 = true;\n\n    }\n    else\n    {\n\n        _S2 = v_0 == 4U;\n\n    }\n\n    float _S4;\n\n    if(_S2)\n    {\n\n        _S4 = 0.0;\n\n    }\n    else\n    {\n\n        _S4 = 1.0;\n\n    }\n\n    return vec2(_S3, _S4);\n}\n\n\nfloat drawnRowHeightPx_0(float rowHeight_1, float rowProportion_1)\n{\n\n    return max(rowHeight_1 * rowProportion_1, 1.0);\n}\n\nfloat rowBandOffsetPx_0(float rowHeight_2, float rowProportion_2)\n{\n\n    return (rowHeight_2 - drawnRowHeightPx_0(rowHeight_2, rowProportion_2)) * 0.5;\n}\n\n\nstruct RowBand_0\n{\n    float height_0;\n    float offset_0;\n};\n\n\nRowBand_0 rowBandPx_0(float rowHeight_3, float rowProportion_3)\n{\n\n    RowBand_0 band_0;\n    band_0.height_0 = drawnRowHeightPx_0(rowHeight_3, rowProportion_3);\n    band_0.offset_0 = rowBandOffsetPx_0(rowHeight_3, rowProportion_3);\n    return band_0;\n}\n\n\nvec2 hpSplitUint_0(uint value_0)\n{\n\n    uint lo_0 = value_0 & 4095U;\n\n    return vec2(float(value_0 - lo_0), float(lo_0));\n}\n\n\nfloat hpToClipX_0(vec2 splitPos_0, vec3 bpRange_0, float hpZero_0)\n{\n    float step_0 = 2.0 / bpRange_0.z;\n    float _S5 = - (1.0 / hpZero_0);\n\n    return dot(vec3(-1.0, max(splitPos_0.x - bpRange_0.x, _S5), max(splitPos_0.y - bpRange_0.y, _S5)), vec3(1.0, step_0, step_0));\n}\n\n\nfloat extendToMinWidthPx_0(float x1_0, float x2_0, float minWidth_0)\n{\n\n    float dx_0 = x2_0 - x1_0;\n\n    float _S6;\n    if((abs(dx_0)) < minWidth_0)\n    {\n\n        if(dx_0 < 0.0)\n        {\n\n            _S6 = - minWidth_0;\n\n        }\n        else\n        {\n\n            _S6 = minWidth_0;\n\n        }\n\n        _S6 = x1_0 + _S6;\n\n    }\n    else\n    {\n\n        _S6 = x2_0;\n\n    }\n\n    return _S6;\n}\n\nfloat extendToMinWidthX_0(float x1_1, float x2_1, float minWidthPx_0, float canvasWidth_0)\n{\n\n    return extendToMinWidthPx_0(x1_1, x2_1, minWidthPx_0 * 2.0 / canvasWidth_0);\n}\n\n\nfloat yPxToClipY_0(float yPx_0, float canvasHeight_1)\n{\n\n    return 1.0 - yPx_0 / canvasHeight_1 * 2.0;\n}\n\n\nvec4 rowRectClipPos_0(uint startBp_0, uint endBp_0, float rowIndex_0, uint vid_1, RowRectUniforms_0 u_1)\n{\n\n    vec2 local_0 = quadLocal_0(vid_1);\n\n    RowBand_0 band_1 = rowBandPx_0(u_1.rowHeight_0, u_1.rowProportion_0);\n    float rowY_0 = band_1.offset_0 + u_1.rowHeight_0 * rowIndex_0 - u_1.scrollTop_0;\n\n    float sx1_0 = hpToClipX_0(hpSplitUint_0(startBp_0), u_1.bpRangeX_0, u_1.zero_0);\n\n    return vec4(mix(sx1_0, extendToMinWidthX_0(sx1_0, hpToClipX_0(hpSplitUint_0(endBp_0), u_1.bpRangeX_0, u_1.zero_0), u_1.minCellPx_0, u_1.minCellDenomPx_0), local_0.x), yPxToClipY_0(mix(rowY_0, rowY_0 + band_1.height_0, local_0.y), u_1.canvasHeight_0), 0.0, 1.0);\n}\n\n\nvec4 unpackRGBA_0(uint c_0)\n{\n\n    return vec4(float((c_0 >> 0U) & 255U), float((c_0 >> 8U) & 255U), float((c_0 >> 16U) & 255U), float((c_0 >> 24U) & 255U)) / 255.0;\n}\n\n\nstruct RowRectVsOut_0\n{\n    vec4 position_0;\n    vec4 color_0;\n};\n\n\nstruct RowRectInstance_0\n{\n    uint x_0;\n    uint x2_2;\n    uint row_0;\n    uint color_1;\n};\n\n\nRowRectVsOut_0 rowRectVertex_0(RowRectInstance_0 inst_0, uint vid_2, RowRectUniforms_0 u_2)\n{\n\n    RowRectVsOut_0 o_0;\n    o_0.position_0 = rowRectClipPos_0(inst_0.x_0, inst_0.x2_2, float(inst_0.row_0), vid_2, u_2);\n    o_0.color_0 = unpackRGBA_0(inst_0.color_1);\n    return o_0;\n}\n\n\nout vec4 v_color;\n\n\nlayout(location = 0)\nin uint a_x;\n\n\nlayout(location = 1)\nin uint a_x2;\n\n\nlayout(location = 2)\nin uint a_row;\n\n\nlayout(location = 3)\nin uint a_color;\n\n\nvoid main()\n{\n\n    RowRectUniforms_0 _S7 = RowRectUniforms_0(u_0.bpRangeX_0, u_0.canvasHeight_0, u_0.minCellDenomPx_0, u_0.minCellPx_0, u_0.zero_0, u_0.rowHeight_0, u_0.rowProportion_0, u_0.scrollTop_0);\n\n    RowRectInstance_0 _S8 = RowRectInstance_0(a_x, a_x2, a_row, a_color);\n    RowRectVsOut_0 _S9 = rowRectVertex_0(_S8, uint(gl_VertexID), _S7);\n\n    gl_Position = _S9.position_0;\n\n    v_color = _S9.color_0;\n\n    return;\n}\n\n"
+
+export const GLSL_FRAGMENT = "#version 300 es\nprecision highp float;\nprecision highp int;\nlayout(location = 0)\nout vec4 entryPointParam_fs_main_0;\n\n\nin vec4 v_color;\n\n\nvoid main()\n{\n\n    entryPointParam_fs_main_0 = v_color;\n\n    return;\n}\n\n"

package/src/shaders/spanMark.iface.generated.ts

@@ -4,7 +4,7 @@
 import type { VertexAttributeLayout, ShaderBinding } from '@jbrowse/render-core/hal'
 
 export const BINDINGS: readonly ShaderBinding[] = [
-  { index: 1, kind: 'uniform', name: 'u' },
+  { index: 1, kind: 'uniform', name: 'u', stages: ['vertex'] },
 ]
 
 export const VERTS_PER_INSTANCE = 6

package/src/shaders/spanMark.wgsl.generated.ts

@@ -0,0 +1,4 @@
+// AUTO-GENERATED by packages/shader-tools/src/shader-codegen from spanMark.slang.
+// Do not edit. Run `pnpm gen:shaders` to regenerate.
+
+export const WGSL_SOURCE = "struct RowRectUniforms_std140_0\n{\n    @align(16) bpRangeX_0 : vec3<f32>,\n    @align(4) canvasHeight_0 : f32,\n    @align(16) minCellDenomPx_0 : f32,\n    @align(4) minCellPx_0 : f32,\n    @align(8) zero_0 : f32,\n    @align(4) rowHeight_0 : f32,\n    @align(16) rowProportion_0 : f32,\n    @align(4) scrollTop_0 : f32,\n};\n\n@binding(1) @group(0) var<uniform> u_0 : RowRectUniforms_std140_0;\nfn quadLocal_0( vid_0 : u32) -> vec2<f32>\n{\n    var v_0 : u32 = vid_0 % u32(6);\n    var _S1 : bool = v_0 == u32(0);\n    var _S2 : bool;\n    if(_S1)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(2);\n    }\n    if(_S2)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(3);\n    }\n    var _S3 : f32;\n    if(_S2)\n    {\n        _S3 = 0.0f;\n    }\n    else\n    {\n        _S3 = 1.0f;\n    }\n    if(_S1)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(1);\n    }\n    if(_S2)\n    {\n        _S2 = true;\n    }\n    else\n    {\n        _S2 = v_0 == u32(4);\n    }\n    var _S4 : f32;\n    if(_S2)\n    {\n        _S4 = 0.0f;\n    }\n    else\n    {\n        _S4 = 1.0f;\n    }\n    return vec2<f32>(_S3, _S4);\n}\n\nfn drawnRowHeightPx_0( rowHeight_1 : f32,  rowProportion_1 : f32) -> f32\n{\n    return max(rowHeight_1 * rowProportion_1, 1.0f);\n}\n\nfn rowBandOffsetPx_0( rowHeight_2 : f32,  rowProportion_2 : f32) -> f32\n{\n    return (rowHeight_2 - drawnRowHeightPx_0(rowHeight_2, rowProportion_2)) * 0.5f;\n}\n\nstruct RowBand_0\n{\n     height_0 : f32,\n     offset_0 : f32,\n};\n\nfn rowBandPx_0( rowHeight_3 : f32,  rowProportion_3 : f32) -> RowBand_0\n{\n    var band_0 : RowBand_0;\n    band_0.height_0 = drawnRowHeightPx_0(rowHeight_3, rowProportion_3);\n    band_0.offset_0 = rowBandOffsetPx_0(rowHeight_3, rowProportion_3);\n    return band_0;\n}\n\nfn hpSplitUint_0( value_0 : u32) -> vec2<f32>\n{\n    var lo_0 : u32 = (value_0 & (u32(4095)));\n    return vec2<f32>(f32(value_0 - lo_0), f32(lo_0));\n}\n\nfn hpToClipX_0( splitPos_0 : vec2<f32>,  bpRange_0 : vec3<f32>,  hpZero_0 : f32) -> f32\n{\n    var step_0 : f32 = 2.0f / bpRange_0.z;\n    var _S5 : f32 = - (1.0f / hpZero_0);\n    return dot(vec3<f32>(-1.0f, max(splitPos_0.x - bpRange_0.x, _S5), max(splitPos_0.y - bpRange_0.y, _S5)), vec3<f32>(1.0f, step_0, step_0));\n}\n\nfn extendToMinWidthPx_0( x1_0 : f32,  x2_0 : f32,  minWidth_0 : f32) -> f32\n{\n    var dx_0 : f32 = x2_0 - x1_0;\n    var _S6 : f32;\n    if((abs(dx_0)) < minWidth_0)\n    {\n        if(dx_0 < 0.0f)\n        {\n            _S6 = - minWidth_0;\n        }\n        else\n        {\n            _S6 = minWidth_0;\n        }\n        _S6 = x1_0 + _S6;\n    }\n    else\n    {\n        _S6 = x2_0;\n    }\n    return _S6;\n}\n\nfn extendToMinWidthX_0( x1_1 : f32,  x2_1 : f32,  minWidthPx_0 : f32,  canvasWidth_0 : f32) -> f32\n{\n    return extendToMinWidthPx_0(x1_1, x2_1, minWidthPx_0 * 2.0f / canvasWidth_0);\n}\n\nfn yPxToClipY_0( yPx_0 : f32,  canvasHeight_1 : f32) -> f32\n{\n    return 1.0f - yPx_0 / canvasHeight_1 * 2.0f;\n}\n\nfn rowRectClipPos_0( startBp_0 : u32,  endBp_0 : u32,  rowIndex_0 : f32,  vid_1 : u32,  u_1 : ptr<function, RowRectUniforms_std140_0>) -> vec4<f32>\n{\n    var local_0 : vec2<f32> = quadLocal_0(vid_1);\n    var band_1 : RowBand_0 = rowBandPx_0((*u_1).rowHeight_0, (*u_1).rowProportion_0);\n    var rowY_0 : f32 = band_1.offset_0 + (*u_1).rowHeight_0 * rowIndex_0 - (*u_1).scrollTop_0;\n    var sx1_0 : f32 = hpToClipX_0(hpSplitUint_0(startBp_0), (*u_1).bpRangeX_0, (*u_1).zero_0);\n    return vec4<f32>(mix(sx1_0, extendToMinWidthX_0(sx1_0, hpToClipX_0(hpSplitUint_0(endBp_0), (*u_1).bpRangeX_0, (*u_1).zero_0), (*u_1).minCellPx_0, (*u_1).minCellDenomPx_0), local_0.x), yPxToClipY_0(mix(rowY_0, rowY_0 + band_1.height_0, local_0.y), (*u_1).canvasHeight_0), 0.0f, 1.0f);\n}\n\nfn unpackRGBA_0( c_0 : u32) -> vec4<f32>\n{\n    return vec4<f32>(f32((((c_0 >> (u32(0)))) & (u32(255)))), f32((((c_0 >> (u32(8)))) & (u32(255)))), f32((((c_0 >> (u32(16)))) & (u32(255)))), f32((((c_0 >> (u32(24)))) & (u32(255))))) / vec4<f32>(255.0f);\n}\n\nstruct RowRectVsOut_0\n{\n    @builtin(position) position_0 : vec4<f32>,\n    @location(0) color_0 : vec4<f32>,\n};\n\nstruct RowRectInstance_0\n{\n     x_0 : u32,\n     x2_2 : u32,\n     row_0 : u32,\n     color_1 : u32,\n};\n\nfn rowRectVertex_0( inst_0 : RowRectInstance_0,  vid_2 : u32,  u_2 : ptr<function, RowRectUniforms_std140_0>) -> RowRectVsOut_0\n{\n    var o_0 : RowRectVsOut_0;\n    var _S7 : vec4<f32> = rowRectClipPos_0(inst_0.x_0, inst_0.x2_2, f32(inst_0.row_0), vid_2, &((*u_2)));\n    o_0.position_0 = _S7;\n    o_0.color_0 = unpackRGBA_0(inst_0.color_1);\n    return o_0;\n}\n\nstruct vertexInput_0\n{\n    @location(0) x_1 : u32,\n    @location(1) x2_3 : u32,\n    @location(2) row_1 : u32,\n    @location(3) color_2 : u32,\n};\n\n@vertex\nfn vs_main( _S8 : vertexInput_0, @builtin(vertex_index) vid_3 : u32) -> RowRectVsOut_0\n{\n    var _S9 : RowRectInstance_0 = RowRectInstance_0( _S8.x_1, _S8.x2_3, _S8.row_1, _S8.color_2 );\n    var _S10 : RowRectUniforms_std140_0 = u_0;\n    var _S11 : RowRectVsOut_0 = rowRectVertex_0(_S9, vid_3, &(_S10));\n    return _S11;\n}\n\nstruct pixelOutput_0\n{\n    @location(0) output_0 : vec4<f32>,\n};\n\nstruct pixelInput_0\n{\n    @location(0) color_3 : vec4<f32>,\n};\n\n@fragment\nfn fs_main( _S12 : pixelInput_0, @builtin(position) position_1 : vec4<f32>) -> pixelOutput_0\n{\n    var _S13 : pixelOutput_0 = pixelOutput_0( _S12.color_3 );\n    return _S13;\n}\n\n"

package/src/shaders/valueScale.slang

@@ -1,52 +1,15 @@
-// The linear value → canvas-y scale a quantitative mark places its datum
-// through: clamp into the domain, invert (a bigger value sits higher), scale to
-// the canvas. `valueToYPx` is the linear scale on its own, which is what a
-// consumer with no scale type of its own reads (Manhattan pins linear, and its
-// -log10 p is already a pre-transform); `valueToYPxScaled` below takes a
-// declared one.
-//
-// Two shapes compose it (ADR-095): `pointMark` reads it for a glyph centre and
-// `barMark` for both cuts of a bar. Each keeps its own anchor (ADR-097) — a
-// point centres on the value, a bar grows from `origin` to it — so only the
-// scale lives here.
-//
-// max(range, 1e-6) guards a degenerate (min == max) domain from dividing by
-// zero. JS spelled that guard `|| 1`, and the two are NOT the same: `|| 1`
-// invents a phantom unit-wide domain, so with bounds pinned to a single value
-// a value half a unit above it drew half-way up the Canvas2D canvas while the
-// GPU clamped it to the top. Pinning a degenerate domain means everything above
-// it is off the top, which is what this does; the parity test pins the case.
-//
-// A declared log scale takes the log arm of `scoreScale`'s `normalizeScore`,
-// the normalizer wiggle and the coverage band are already placed by, so a mark
-// display's axis ticks and its shader agree by construction. The linear arm
-// stays this module's own: `normalizeScore` answers 0 on a degenerate domain
-// and this answers 1, and that difference is a pinned cross-backend value
-// (ADR-097).
-//
-// The JS twin is lifted by `pointMark.slang`'s `//! js-export` rather than
-// here, the way hpmath's `expandToMinWidthPx` reaches JS through
-// `coverageBar.slang`: one twin, in the generated module every consumer of the
-// scale already imports.
+// A quantitative mark's value → canvas y: `scoreScale`'s normalizer, flipped
+// so a bigger value sits higher. Only the scale lives here; each shape keeps
+// its own anchor (ADR-097). `pointMark.slang` lifts the JS twin.
+//! js-skip: valueToYPx — the linear case of valueToYPxScaled, whose twin pointMark.slang lifts; a shader reading it alone (the score example's scoreBarHeightPx) lifts the caller it sits inside
 module valueScale;
 
 import scoreScale;
 
-public float valueToYPx(float value, float domainMin, float domainMax, float h) {
-  float norm = clamp(
-    (value - domainMin) / max(domainMax - domainMin, 1e-6),
-    0.0,
-    1.0,
-  );
-  return (1.0 - norm) * h;
+public float valueToYPxScaled(float value, float domainMin, float domainMax, float h, int scaleType) {
+  return (1.0 - normalizeScore(value, domainMin, domainMax, scaleType, 1.0)) * h;
 }
 
-// The same placement under a declared scale type: `SCALE_TYPE_LOG` reads the
-// value through `scoreScale`'s log arm, anything else through the linear one
-// above.
-public float valueToYPxScaled(float value, float domainMin, float domainMax, float h, int scaleType) {
-  if (scaleType == SCALE_TYPE_LOG) {
-    return (1.0 - normalizeScore(value, domainMin, domainMax, SCALE_TYPE_LOG, 1.0)) * h;
-  }
-  return valueToYPx(value, domainMin, domainMax, h);
+public float valueToYPx(float value, float domainMin, float domainMax, float h) {
+  return valueToYPxScaled(value, domainMin, domainMax, h, 0);
 }