@swf2es/render 0.1.20 → 0.1.21

package/dist/webgl/programs.js

@@ -19,6 +19,13 @@ export const TINT_AT = 7;
 export const DRAW_AT = 8;
 /** The most cutoff table entries a text's draw takes, as the player's text/saffron.ts builds them. */
 export const TABLE_ENTRIES = 48;
+/**
+ * Texels a text's slot in the glyph tables' texture (GlyphTables): its mode,
+ * then its table's entries; and texels a line of it. Powers of two, which
+ * the vertex shader splits a slot's texel into column and line with.
+ */
+export const TABLE_SLOT = 64;
+export const TABLE_LINE = 1024;
 /** Segments a row of the outlines' texture, as the player's text/saffron.ts stores them. */
 export const OUTLINE_ROW = 1024;
 /**
@@ -52,6 +59,8 @@ export const RUN_UNIT = FILL_UNIT + FILL_TEXTURES;
 export const MERGED_UNIT = RUN_UNIT + 1;
 /** The merged fills' rows a line of their integer texture: a power of two, as for RUN_MOST. */
 export const MERGED_LINE = 1024;
+/** The glyph tables' unit (GlyphTables), past the merged fills' rows. */
+export const TABLE_UNIT = MERGED_UNIT + 1;
 /**
  * Places a vertex by its row's transform, on a quarter of a pixel of
  * Flash's (uUnit of them a stage pixel, from the stage's origin) where it
@@ -268,11 +277,14 @@ void main(void) {
  * pixels to Flash's, uUnit of them a stage pixel, on their grid from the
  * stage's origin, a BitmapData's in a draw. A glyph's pen stands where its
  * text's origin, at a whole pixel, puts it, snapped as its grid fits it
- * (uMode: gridFitType 0 none, 1 pixel, 2 subpixel, thickness, sharpness),
- * and its quad reaches out past its outline by the furthest cutoff. Its
- * colour is drawn under the row's colour transform, light or dark as adl
- * chooses its table. aOrigin: the pen, and its light and dark tables, each
- * its first entry plus 64 times its entries; aGlyph: a corner of its
+ * (its mode: gridFitType 0 none, 1 pixel, 2 subpixel, thickness,
+ * sharpness), and its quad reaches out past its outline by the furthest
+ * cutoff. Its colour is drawn under the row's colour transform, light or
+ * dark as adl chooses its table. The text's mode and tables are in its slot
+ * of uTables (uTable; GlyphTables), read by texelFetch: not a uniform array
+ * indexed by each glyph's table start, the access that hung Intel's GPUs
+ * in the fill program's run table. aOrigin: the pen, and its light and dark tables,
+ * each its first entry plus 64 times its entries; aGlyph: a corner of its
  * outline's bounds and the way out from it; aRun: its segments, first and
  * count, the pixels of a unit of its outline, and its size.
  */
@@ -287,8 +299,8 @@ uniform highp sampler2D uRows;
 uniform int uRow;
 uniform vec4 uView;
 uniform float uUnit;
-uniform vec4 uMode;
-uniform vec4 uTable[${TABLE_ENTRIES}];
+uniform highp sampler2D uTables;
+uniform int uTable;
 out vec2 vPixel;
 flat out vec2 vPen;
 flat out vec4 vToGlyph;
@@ -296,10 +308,16 @@ flat out vec4 vToPixel;
 flat out vec4 vCut;
 flat out vec4 vShown;
 
+// Texel i of the text's slot: its mode, then its tables' entries.
+vec4 slot(int i) {
+  int at = uTable * ${TABLE_SLOT} + i;
+  return texelFetch(uTables, ivec2(at & ${TABLE_LINE - 1}, at >> ${Math.log2(TABLE_LINE)}), 0);
+}
+
 // The cutoffs at ppem by the table of entries start to start + count, as text/csm.ts' cutoffs.
-vec2 cutoffs(int start, int count, float ppem) {
-  vec4 first = uTable[start];
-  vec4 last = uTable[start + count - 1];
+vec2 cutoffs(vec4 mode, int start, int count, float ppem) {
+  vec4 first = slot(1 + start);
+  vec4 last = slot(start + count);
   vec2 c = first.yz;
   if (ppem >= last.x) {
     c = last.yz;
@@ -309,9 +327,9 @@ vec2 cutoffs(int start, int count, float ppem) {
         break;
       }
 
-      vec4 b = uTable[start + i];
+      vec4 b = slot(1 + start + i);
       if (ppem <= b.x) {
-        vec4 a = uTable[start + i - 1];
+        vec4 a = slot(start + i);
         c = mix(a.yz, b.yz, (ppem - a.x) / (b.x - a.x));
         break;
       }
@@ -319,8 +337,8 @@ vec2 cutoffs(int start, int count, float ppem) {
   }
 
   float unit = 0.0001 * ppem;
-  float t = clamp(uMode.y, -200.0, 200.0);
-  float s = clamp(uMode.z, -400.0, 400.0);
+  float t = clamp(mode.y, -200.0, 200.0);
+  float s = clamp(mode.z, -400.0, 400.0);
   c -= unit * vec2(t + s * 0.5, t - s * 0.5);
   if (c.x < c.y) {
     c = vec2((c.x + c.y) * 0.5);
@@ -335,6 +353,7 @@ void main(void) {
   vec4 t = texelFetch(uRows, at + ivec2(1, 0), 0);
   vec4 mul = texelFetch(uRows, at + ivec2(2, 0), 0);
   vec4 add = texelFetch(uRows, at + ivec2(3, 0), 0);
+  vec4 mode = slot(0);
   // The text's pixels to Flash's.
   mat2 linear = mat2(m.xy, m.zw) * uUnit;
   vec2 origin = t.xy * uUnit;
@@ -342,9 +361,9 @@ void main(void) {
   float across = max(abs(linear[0][1]), abs(linear[1][0]));
   if (across > max(abs(linear[0][0]), abs(linear[1][1])) / 65536.0) {
     // Turned or skewed: no grid.
-  } else if (uMode.x == 1.0) {
+  } else if (mode.x == 1.0) {
     pen = vec2(roundEven(pen.x * 8.0) / 8.0 + 0.5, roundEven(pen.y));
-  } else if (uMode.x == 2.0) {
+  } else if (mode.x == 2.0) {
     pen = vec2(roundEven(pen.x * 4.0) / 4.0 + 0.5, roundEven(pen.y));
   } else {
     pen = roundEven(pen * 4.0) / 4.0 + vec2(0.5, 0.0);
@@ -355,7 +374,7 @@ void main(void) {
   vec4 shown = clamp(aColor * mul + add, 0.0, 1.0);
   bool light = dot(floor(shown.rgb * 255.0 + 0.5), vec3(30.0, 59.0, 11.0)) > 20000.0;
   int table = int(light ? aOrigin.z : aOrigin.w);
-  vec2 cut = cutoffs(table & 63, table >> 6, ppem);
+  vec2 cut = cutoffs(mode, table & 63, table >> 6, ppem);
   mat2 toPixel = linear * aRun.z;
   float margin = max(abs(cut.x), abs(cut.y)) + 1.0;
   float det = determinant(toPixel);

package/dist/webgl/programs.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swf2es/render",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "swf2es's own renderer: a scene list, a planner and a WebGL 2 backend (docs/renderer.md)",
   "keywords": [
     "swf",
@@ -33,6 +33,6 @@
     "src"
   ],
   "dependencies": {
-    "@swf2es/context3d": "0.1.20"
+    "@swf2es/context3d": "0.1.21"
   }
 }

package/src/filter-plan.ts

@@ -38,21 +38,24 @@ export const KERNEL_PASS = 10;
 
 /**
  * How a uniform's values are set: one to four floats, an array of vec4s, a
- * 4 by 4 matrix, an array of ivec4s, or a sampler, its value the texture of
- * the frame's it reads.
+ * 4 by 4 matrix, an array of ivec4s, a sampler, its value the texture of
+ * the frame's it reads, or a sampler of a line of floats, its values, for a
+ * shader that reads them at a varying index (as a uniform array read so
+ * hangs some GPUs).
  */
 export const FLOATS = 1;
 export const VEC4S = 2;
 export const MATRIX4 = 3;
 export const IVEC4S = 4;
 export const SAMPLER = 5;
+export const FLOAT_LINE = 6;
 
 /** A pass's blurred input (FilterPass.blurred): none read, or the pass's input itself. */
 export const NO_BLUR = -2;
 export const INPUT_BLUR = -1;
 
-/** The most floats a convolution's matrix takes in its shader: 57 vec4s. */
-const CONVOLUTION_FLOATS = 57 * 4;
+/** The most floats a convolution's matrix takes in its shader: 15 by 15. */
+const CONVOLUTION_FLOATS = 15 * 15;
 
 /** One pass: a program drawn from slot `input` into slot `output`, its uniforms in its plan's. */
 export interface FilterPass {
@@ -468,7 +471,7 @@ function colorMatrix(
   return out;
 }
 
-/** A convolution's weights, its matrix by rows padded to the shader's array. */
+/** A convolution's weights, its matrix by rows padded to the shader's line. */
 const weights = new Float32Array(CONVOLUTION_FLOATS);
 
 function convolution(
@@ -485,7 +488,7 @@ function convolution(
   weights.set(v.subarray(at + 12, at + 12 + Math.min(columns * rows, weights.length)));
   const out = plan.slot(width, height);
   plan.pass(CONVOLUTION_PASS, input, width, height, out, width, height);
-  plan.uniformFrom("uMatrix", VEC4S, weights, 0, weights.length);
+  plan.uniformFrom("uWeights", FLOAT_LINE, weights, 0, weights.length);
   plan.uniform("uSize", 2, columns, rows);
   plan.uniformFrom("uEdge", FLOATS, v, at + 2, 4);
   plan.uniform("uDivisor", 1, v[at + 6]);

package/src/filter-shaders.ts

@@ -312,7 +312,7 @@ export const CONVOLUTION = `in vec2 vTextureCoord;
 out vec4 finalColor;
 uniform sampler2D uTexture;
 uniform highp vec4 uInputSize;
-uniform vec4 uMatrix[57];
+uniform highp sampler2D uWeights;
 uniform vec2 uSize;
 uniform vec4 uBox;
 uniform vec4 uEdge;
@@ -342,10 +342,10 @@ void main(void) {
   int cols = int(uSize.x);
   int count = cols * int(uSize.y);
   vec4 sum = vec4(0.0);
-  // One loop, its index alone indexing the weights, as GLSL ES 1 allows.
   for (int k = 0; k < 225; k++) {
     if (k >= count) { break; }
-    float w = dot(uMatrix[k / 4], vec4(equal(vec4(float(k - k / 4 * 4)), vec4(0.0, 1.0, 2.0, 3.0))));
+    // From a texture: a uniform array indexed so is what hung Intel's GPUs in other programs.
+    float w = texelFetch(uWeights, ivec2(k, 0), 0).r;
     if (w != 0.0) {
       int j = k / cols;
       vec2 at = vec2(float(k - j * cols), float(j)) - reach;

package/src/webgl/atlas.ts

@@ -1,5 +1,6 @@
 import type { GlState } from "@swf2es/context3d/device";
 import { type Geometries, type GeometryData, GLYPH_FLOATS } from "../geometry.js";
+import { GlyphTables } from "./glyph-tables.js";
 import {
   COLOR_AT,
   DEPTH_AT,
@@ -67,13 +68,16 @@ function interleave(
   }
 }
 
-/** Where a geometry lies in the atlas, or the glyph atlas with its text's mode and table. */
+/**
+ * Where a geometry lies in the atlas, or the glyph atlas with its text's
+ * mode and table, and their slot in the glyph tables (-1 past their room).
+ */
 export interface Place {
   vertexStart: number;
   vertices: number;
   indexStart: number;
   indices: number;
-  glyphs: { mode: Float32Array; table: Float32Array } | null;
+  glyphs: { mode: Float32Array; table: Float32Array; slot: number } | null;
   /** Its geometry's flat (GeometryData.flat). */
   flat: boolean;
   /** Small, unchanged geometries may be copied into a run's streaming buffer. */
@@ -122,10 +126,13 @@ export class GeometryAtlas {
     live: 0,
     holes: 0,
   };
+  /** The texts' modes and tables, which the glyph program reads. */
+  readonly tables: GlyphTables;
 
   constructor(gl: WebGL2RenderingContext, state: GlState) {
     this.gl = gl;
     this.state = state;
+    this.tables = new GlyphTables(gl, state);
   }
 
   /** The buffers and vertex arrays made, both atlases empty, as the context comes or comes back. */
@@ -177,6 +184,7 @@ export class GeometryAtlas {
     this.stagedVertices = 0;
     this.stagedIndexCount = 0;
     this.places = [];
+    this.tables.setUp();
   }
 
   /**
@@ -254,7 +262,8 @@ export class GeometryAtlas {
     const texts =
       g.top + glyphVertices > g.capacity ||
       g.indexTop + glyphIndices > g.indexCapacity ||
-      (g.holes > GLYPHS_LEAST && g.holes > g.live);
+      (g.holes > GLYPHS_LEAST && g.holes > g.live) ||
+      this.tables.full;
     if (shapes) {
       this.repack(geometries);
     }
@@ -272,6 +281,7 @@ export class GeometryAtlas {
 
     geometries.added.length = 0;
     this.flush();
+    this.tables.upload();
   }
 
   /** Every live shape's geometry copied into new buffers, with room for twice what is live. */
@@ -336,12 +346,16 @@ export class GeometryAtlas {
     g.indexTop = 0;
     g.live = 0;
     g.holes = 0;
+    // Only the live texts' tables kept.
+    this.tables.reset();
     for (const id of ids) {
       const data = geometries.get(id) as GeometryData;
       if (data.glyphs) {
         this.copyGlyphs(id, data);
       }
     }
+
+    this.tables.upload();
   }
 
   /** `data` copied in at the top of the atlas, its indices made absolute. */
@@ -483,7 +497,11 @@ export class GeometryAtlas {
       vertices: count,
       indexStart: g.indexTop,
       indices: indices.length,
-      glyphs: { mode: glyphs.mode, table: glyphs.table },
+      glyphs: {
+        mode: glyphs.mode,
+        table: glyphs.table,
+        slot: this.tables.slot(glyphs.mode, glyphs.table),
+      },
       flat: false,
       batch: null,
     };
@@ -501,5 +519,6 @@ export class GeometryAtlas {
     gl.deleteVertexArray(this.glyphArray);
     gl.deleteBuffer(this.glyphBuffer);
     gl.deleteBuffer(this.glyphIndexBuffer);
+    this.tables.destroy();
   }
 }

package/src/webgl/draws.ts

@@ -37,6 +37,7 @@ import {
   RUN_MOST,
   RUN_UNIT,
   SNAP_BIT,
+  TABLE_UNIT,
   TEXTURE_UNIT,
 } from "./programs.js";
 import { framebufferOf, type Open, type Target, type TargetPool } from "./targets.js";
@@ -166,15 +167,17 @@ export class Draws {
   private meshMode = -1;
   /**
    * Advanced text's program (GeometryData.glyphs), where it takes its row, view, Flash's
-   * pixels a stage pixel, mode and table; its vertices are in an atlas of their own.
+   * pixels a stage pixel and its text's slot in the glyph tables (GlyphTables), and the row
+   * and slot told it last, -1 for none; its vertices are in an atlas of their own.
    */
   private glyphProgram!: WebGLProgram;
   private glyphRowLocation: WebGLUniformLocation | null = null;
   private glyphViewLocation: WebGLUniformLocation | null = null;
   private glyphUnitLocation: WebGLUniformLocation | null = null;
-  private glyphModeLocation: WebGLUniformLocation | null = null;
   private glyphTableLocation: WebGLUniformLocation | null = null;
   private glyphStale = true;
+  private glyphRow = -1;
+  private glyphTable = -1;
   /** Flash's pixels a stage pixel: the target's pixels a stage pixel over those a pixel of Flash's. */
   private unit = 1;
   /**
@@ -279,12 +282,14 @@ export class Draws {
     this.glyphRowLocation = gl.getUniformLocation(this.glyphProgram, "uRow");
     this.glyphViewLocation = gl.getUniformLocation(this.glyphProgram, "uView");
     this.glyphUnitLocation = gl.getUniformLocation(this.glyphProgram, "uUnit");
-    this.glyphModeLocation = gl.getUniformLocation(this.glyphProgram, "uMode");
     this.glyphTableLocation = gl.getUniformLocation(this.glyphProgram, "uTable");
     this.state.useProgram(this.glyphProgram);
     gl.uniform1i(gl.getUniformLocation(this.glyphProgram, "uRows"), 0);
     gl.uniform1i(gl.getUniformLocation(this.glyphProgram, "uSegments"), OUTLINE_UNIT);
+    gl.uniform1i(gl.getUniformLocation(this.glyphProgram, "uTables"), TABLE_UNIT);
     this.glyphStale = true;
+    this.glyphRow = -1;
+    this.glyphTable = -1;
     this.lastRow = -1;
   }
 
@@ -846,7 +851,8 @@ export class Draws {
   /**
    * Entry `i`, advanced text's glyph quads (GeometryData.glyphs), drawn by the glyph
    * program from its atlas, which is told the view as it changed, and its
-   * text's mode and table; the glyph program left in use.
+   * row and its text's slot in the glyph tables as they change; the glyph
+   * program left in use.
    */
   private drawGlyphs(scene: SceneList, i: number, place: Place): void {
     const gl = this.gl;
@@ -860,11 +866,23 @@ export class Draws {
       this.glyphStale = false;
     }
 
-    gl.uniform1i(this.glyphRowLocation, scene.row[i]);
-    gl.uniform4fv(this.glyphModeLocation, glyphs.mode);
-    gl.uniform4fv(this.glyphTableLocation, glyphs.table);
+    const row = scene.row[i];
+    if (row !== this.glyphRow) {
+      gl.uniform1i(this.glyphRowLocation, row);
+      this.glyphRow = row;
+    }
+
+    const tables = this.atlas.tables;
+    const slot = glyphs.slot >= 0 ? glyphs.slot : tables.scratch(glyphs.mode, glyphs.table);
+    if (slot !== this.glyphTable) {
+      gl.uniform1i(this.glyphTableLocation, slot);
+      this.glyphTable = slot;
+    }
+
     state.bindTexture(OUTLINE_UNIT, this.gpu.outlines);
     state.bindSampler(OUTLINE_UNIT, null);
+    state.bindTexture(TABLE_UNIT, tables.texture);
+    state.bindSampler(TABLE_UNIT, null);
     gl.drawElements(gl.TRIANGLES, place.indices, gl.UNSIGNED_INT, place.indexStart * 4);
   }
 

package/src/webgl/filters.ts

@@ -5,6 +5,7 @@ import {
   CONVOLUTION_PASS,
   DISPLACE_PASS,
   FilterPlan,
+  FLOAT_LINE,
   FLOATS,
   GLOW_PASS,
   GRADIENT_PASS,
@@ -59,6 +60,8 @@ export interface FilterHost<T extends FilterTarget> {
 const INPUT_UNIT = 4;
 const BLURRED_UNIT = 5;
 const EXTRA_UNIT = 6;
+/** A pass's line of floats (FLOAT_LINE): a convolution's weights, which reads no gradient nor map. */
+const LINE_UNIT = EXTRA_UNIT;
 
 /**
  * A triangle over the output's frame, the viewport, reading its input
@@ -146,6 +149,10 @@ export class FilterRunner<T extends FilterTarget> {
   private readonly hasTexture = (id: number) => id >= 0 && this.host.texture(id) !== null;
   /** The target's pixels a unit of its own, for the chain running. */
   private resolution = 1;
+  /** The texture of a pass's line of floats (FLOAT_LINE), its width, and the floats' bits it holds. */
+  private line: WebGLTexture | null = null;
+  private lineWidth = 0;
+  private lineBits = new Uint32Array(0);
 
   constructor(
     gl: WebGL2RenderingContext,
@@ -356,6 +363,10 @@ export class FilterRunner<T extends FilterTarget> {
         // As many as KERNEL_IMAGES, which the plan holds a kernel to.
         this.kernels.bindImage(location, this.samplers++, values[at], this.host);
         break;
+      case FLOAT_LINE:
+        gl.uniform1i(location, LINE_UNIT);
+        this.bindLine(values, at, count);
+        break;
       case FLOATS:
         this.set(
           pass,
@@ -369,6 +380,45 @@ export class FilterRunner<T extends FilterTarget> {
     }
   }
 
+  /**
+   * `count` of `values` from `at` bound on LINE_UNIT as a line of floats,
+   * uploaded where they are not the ones it holds: a frame's filters alike
+   * take the same.
+   */
+  private bindLine(values: Float32Array, at: number, count: number): void {
+    const gl = this.gl;
+    const bits = new Uint32Array(values.buffer, values.byteOffset + at * 4, count);
+    let same = this.line !== null && count === this.lineBits.length;
+    for (let k = 0; same && k < count; k++) {
+      same = bits[k] === this.lineBits[k];
+    }
+
+    if (!same) {
+      if (!this.line || count > this.lineWidth) {
+        if (this.line) {
+          this.state.dropTexture(this.line);
+          gl.deleteTexture(this.line);
+        }
+
+        this.line = gl.createTexture() as WebGLTexture;
+        this.lineWidth = count;
+        this.state.bindTexture(LINE_UNIT, this.line);
+        this.state.activeTexture(LINE_UNIT);
+        gl.texStorage2D(gl.TEXTURE_2D, 1, gl.R32F, count, 1);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+      }
+
+      this.state.bindTexture(LINE_UNIT, this.line);
+      this.state.activeTexture(LINE_UNIT);
+      gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, count, 1, gl.RED, gl.FLOAT, values, at);
+      this.lineBits = bits.slice();
+    }
+
+    this.state.bindTexture(LINE_UNIT, this.line);
+    this.state.bindSampler(LINE_UNIT, null);
+  }
+
   /** The pass of program `id` (filter-plan.ts), in use. */
   private program(id: number): Pass {
     switch (id) {
@@ -498,5 +548,10 @@ export class FilterRunner<T extends FilterTarget> {
     }
 
     this.passes.clear();
+    if (this.line) {
+      this.state.dropTexture(this.line);
+      this.gl.deleteTexture(this.line);
+      this.line = null;
+    }
   }
 }