@colordx/gpu 0.1.1 → 0.2.0

package/README.md

@@ -79,9 +79,10 @@ Renders one gamut slice. Returns `false` while the WebGL context is lost (it re-
 | `showP3` | Also paint the P3-only region (sRGB-only pixels otherwise) |
 | `showRec2020` | Also paint the Rec.2020-only region |
 | `borderP3`, `borderRec2020` | RGBA arrays (0–1) for the boundary lines |
+| `borderWidth` | Boundary line width in device pixels (default `1` — a hairline, half a CSS pixel on a 2× display) |
 | `p3Output` | Encode output as Display-P3 and switch the drawing buffer to `display-p3` (Chrome 104+, Safari 16.4+; silently stays sRGB elsewhere) |
 
-Pixels outside every enabled gamut are transparent. Boundary lines are analytic contours of the gamut overflow field (`fwidth`-based), so they stay ~1.5 px crisp at any canvas size or DPR.
+Pixels outside every enabled gamut are transparent. Boundary lines are anti-aliased analytic contours of the gamut overflow field (`fwidth`-based), `borderWidth` device pixels wide at any canvas size or DPR.
 
 ### `renderer.destroy()`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colordx/gpu",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "colordx color math on the GPU — OKLCH/LCH conversions and gamut tests as generated GLSL, parity-tested against @colordx/core. Ships a WebGL2 gamut-slice chart renderer; shader chunks and WebGPU batch conversion on the roadmap",
   "author": "Dmitrii Kriaklin",
   "license": "MIT",

package/src/glsl.js

@@ -64,6 +64,7 @@ uniform float u_value;
 uniform float u_xMax, u_yMax;
 uniform bool u_showP3, u_showRec2020, u_p3Out;
 uniform vec4 u_borderP3, u_borderRec2020;
+uniform float u_borderWidth;  // device pixels
 
 const float GAP = 1e-7;       // RENDER_GAP twin
 
@@ -76,10 +77,25 @@ float overflow(vec3 c) {
   vec3 d = max(c - 1.0, -c);
   return max(d.r, max(d.g, d.b));
 }
+// coverage of a u_borderWidth-px-wide band centered on the field's zero
+// contour: fwidth(field) is the field's change across one device pixel, so
+// dividing by it converts field distance to pixel distance
+float contour(float field) {
+  float px = max(fwidth(field), 1e-12);
+  return clamp((0.5 * u_borderWidth + 0.5) - abs(field) / px, 0.0, 1.0);
+}
+// composite the border over the fill by its pixel coverage; alpha only
+// grows so a translucent border can't punch a hole in an opaque fill
+vec4 blendBorder(vec4 fill, vec4 border, float cov) {
+  float a = cov * border.a;
+  return vec4(mix(fill.rgb, border.rgb, a), max(fill.a, a));
+}
 
 void main() {
-  // gl_FragCoord y is bottom-up, matching the picker's paintPixel flip
-  vec2 uv = gl_FragCoord.xy / u_res;
+  // gl_FragCoord y is bottom-up, matching the picker's paintPixel flip.
+  // Sample where the CPU painter did: column corner on x, and its
+  // one-pixel y offset (paintPixel wrote row y to height - y).
+  vec2 uv = (gl_FragCoord.xy + vec2(-0.5, 0.5)) / u_res;
   float l, c, h;
   if (u_plane == 0)      { l = uv.x * u_xMax; c = uv.y * u_yMax; h = u_value; }
   else if (u_plane == 1) { h = uv.x * u_xMax; c = uv.y * u_yMax; l = u_value; }
@@ -101,17 +117,22 @@ void main() {
     vec3 enc = u_p3Out
       ? srgbEncode(clamp(linP3, 0.0, 1.0))
       : srgbEncode(clamp(lin, 0.0, 1.0));
+    // match the CPU painter's Math.floor(255 * v) quantization; the small
+    // bias absorbs fp32 jitter where 255 * v lands on an integer
+    enc = floor(enc * 255.0 + 1e-3) / 255.0;
     col = vec4(enc, 1.0);
   }
 
-  // boundary lines, ~1.5px crisp contours of the gamut overflow fields
-  float wS = 0.75 * fwidth(fs);
-  float wP = 0.75 * fwidth(fp);
+  // boundary lines: anti-aliased contours of the gamut overflow fields,
+  // u_borderWidth device pixels wide (a hairline by default, like the
+  // 1-device-pixel lines of a CPU painter)
+  float covS = contour(fs);
+  float covP = contour(fp);
   if (u_showP3) {
-    if (abs(fs) < wS && inP) col = u_borderP3;
-    if (u_showRec2020 && abs(fp) < wP && inR && !inS) col = u_borderRec2020;
+    if (inP) col = blendBorder(col, u_borderP3, covS);
+    if (u_showRec2020 && inR && !inS) col = blendBorder(col, u_borderRec2020, covP);
   } else if (u_showRec2020) {
-    if (abs(fs) < wS && inR) col = u_borderRec2020;
+    if (inR) col = blendBorder(col, u_borderRec2020, covS);
   }
 
   frag = vec4(col.rgb * col.a, col.a); // premultiplied alpha

package/src/index.d.ts

@@ -13,6 +13,12 @@ export interface ChartPaintOptions {
   borderP3: BorderRgba
   /** RGBA 0–1 for the P3↔Rec2020 (or sRGB↔Rec2020) boundary line */
   borderRec2020: BorderRgba
+  /**
+   * Boundary line width in device pixels (default 1 — a hairline, half a
+   * CSS pixel on a 2× display). Lines are anti-aliased, so fractional
+   * widths work.
+   */
+  borderWidth?: number
   /** Encode output for a display-p3 drawing buffer (wide-gamut displays) */
   p3Output?: boolean
   plane: ChartPlane
@@ -28,7 +34,11 @@ export interface ChartPaintOptions {
 
 export interface ChartRenderer {
   readonly canvas: HTMLCanvasElement
-  /** Release the WebGL context */
+  /**
+   * Release GPU resources and make the renderer inert. Does not lose the
+   * WebGL context (a canvas can only ever produce one), so a new renderer
+   * can be created on the same canvas afterwards.
+   */
   destroy(): void
   /** Render a slice; returns false while the WebGL context is lost */
   paint(opts: ChartPaintOptions): boolean

package/src/index.js

@@ -18,11 +18,16 @@ export function createChartRenderer(canvas, options = {}) {
     premultipliedAlpha: true,
     stencil: false,
   })
-  if (!gl) return null
+  if (!gl || gl.isContextLost()) return null
+
+  // dithering is on by default and driver-dependent; disable it so the
+  // float → 8-bit conversion is deterministic everywhere
+  gl.disable(gl.DITHER)
 
   let program = null
   let uniforms = null
   let contextLost = false
+  let destroyed = false
 
   function init() {
     const compile = (type, src) => {
@@ -45,17 +50,20 @@ export function createChartRenderer(canvas, options = {}) {
     uniforms = {}
     for (const name of [
       'u_res', 'u_plane', 'u_value', 'u_xMax', 'u_yMax',
-      'u_showP3', 'u_showRec2020', 'u_p3Out', 'u_borderP3', 'u_borderRec2020',
+      'u_showP3', 'u_showRec2020', 'u_p3Out',
+      'u_borderP3', 'u_borderRec2020', 'u_borderWidth',
     ]) {
       uniforms[name] = gl.getUniformLocation(program, name)
     }
   }
 
   canvas.addEventListener('webglcontextlost', e => {
+    if (destroyed) return
     e.preventDefault()
     contextLost = true
   })
   canvas.addEventListener('webglcontextrestored', () => {
+    if (destroyed) return
     contextLost = false
     init()
   })
@@ -66,10 +74,16 @@ export function createChartRenderer(canvas, options = {}) {
   return {
     canvas,
     destroy() {
-      gl.getExtension('WEBGL_lose_context')?.loseContext()
+      // Do NOT force-lose the context: a canvas can only ever produce one
+      // WebGL context, so losing it would break any later renderer on the
+      // same canvas (e.g. a React StrictMode remount). Just release the
+      // program and go inert; the context is reclaimed with the canvas.
+      destroyed = true
+      gl.deleteProgram(program)
+      program = null
     },
     paint(opts) {
-      if (contextLost) return false
+      if (destroyed || contextLost || !program) return false
 
       if ('drawingBufferColorSpace' in gl) {
         try {
@@ -92,6 +106,7 @@ export function createChartRenderer(canvas, options = {}) {
       gl.uniform1i(uniforms.u_p3Out, opts.p3Output ? 1 : 0)
       gl.uniform4fv(uniforms.u_borderP3, opts.borderP3)
       gl.uniform4fv(uniforms.u_borderRec2020, opts.borderRec2020)
+      gl.uniform1f(uniforms.u_borderWidth, opts.borderWidth ?? 1)
       gl.drawArrays(gl.TRIANGLES, 0, 3)
       return true
     },