onejs-sl 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.1.9
+
+Two inputs built from the others (`Specs/SL_NEXT.md` 6), and a converter that carries more of a pasted shader over. A program that names neither input compiles to exactly what it did.
+
+- `texel` is one pixel in uv, and `centered` is uv with 0 at the centre and x scaled by aspect
+- A local, parameter or uniform named `texel` or `centered` keeps working
+- A local named after a builtin can be assigned to
+- `fromGLSL` reads `u_time` and `u_resolution` as the inputs, and drops their declarations
+- `fromGLSL` turns a mat2 rotation into `rotate()`, and points any other mat2 at it
+- `INPUT_DOCS` say `uv` and `fragCoord` are the centre of the pixel
+
 ## 0.1.8
 
 A pasted GLSL shader becomes a `.sl` file (`Specs/SL_NEXT.md` 5). Nothing a program compiles to changes.

package/README.md

@@ -345,8 +345,18 @@ reset takes the whole page's device, Unity's included.
 ## What a program is given
 
 `uv`, `fragCoord`, `resolution`, `time` and `aspect`, and the last three are the
-**target's**, not the window's. A program is drawn with `Graphics.Blit` into the
-element's own render texture, and Unity sets `_ScreenParams` per camera and
+**target's**, not the window's. `uv` and `fragCoord` are the centre of the pixel
+being drawn, so the first column's `fragCoord.x` is 0.5 on both backends.
+
+Two more are built from those: `texel`, one pixel in uv (`1 / resolution`), and
+`centered`, uv with 0 at the centre and x scaled by `aspect`, so a circle drawn
+in it stays round. They are recorded only when a program names them, so every
+program that does not compiles to the bytes it always did, and a program with a
+`texel` of its own keeps it: a local, a parameter or a uniform of that name
+shadows the input.
+
+Why `resolution` and `aspect` are the target's: a program is drawn with
+`Graphics.Blit` into the element's own render texture, and Unity sets `_ScreenParams` per camera and
 leaves it alone for a blit: reading it from a 64x256 target answers with the
 game view's size. Both backends read the same wrong thing, so they agreed with
 each other and the eject test, which compares them, saw nothing. What saw it was

package/goldens/goldens.json

@@ -1,6 +1,6 @@
 {
  "generatedBy": "onejs-sl goldens/run.mjs",
- "package": "0.1.2",
+ "package": "0.1.9",
  "ir": 2,
  "target": "rgba8unorm-srgb: straight alpha, 8 bit, sRGB encoded, the stored bytes of a Linear OneJS game's element",
  "size": [
@@ -108,6 +108,14 @@
     "1.25": [255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255,255,128,64,255]
    }
   },
+  "inputs.sl": {
+   "hash": "07cd901a",
+   "source": "// texel and centered, the inputs built from the others (Specs/SL_NEXT.md 6).\n// A ring that stays round in any output shape, over cells 16 pixels wide.\nfloat4 main() {\n    float ring = smoothstep(0.02, 0.0, abs(length(centered) - 0.3));\n    float2 cell = frac(uv / (texel * 16.0));\n    return float4(ring, cell, 1);\n}\n",
+   "samples": {
+    "0": [0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,173,171,86,255,139,212,86,255,0,244,86,255,0,110,86,255,207,171,86,255,24,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,253,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,193,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,173,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,139,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,253,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,188,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,207,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,207,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,226,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,24,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,193,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,253,212,237,255,188,244,237,255,207,110,237,255,226,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255],
+    "1.25": [0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,173,171,86,255,139,212,86,255,0,244,86,255,0,110,86,255,207,171,86,255,24,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,253,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,193,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,173,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,139,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,253,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,188,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,207,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,207,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,226,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,24,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,193,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,253,212,237,255,188,244,237,255,207,110,237,255,226,171,237,255,0,212,237,255,0,244,237,255,0,110,237,255,0,171,237,255,0,212,237,255,0,244,237,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,202,255,0,171,202,255,0,212,202,255,0,244,202,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,158,255,0,171,158,255,0,212,158,255,0,244,158,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255,0,110,86,255,0,171,86,255,0,212,86,255,0,244,86,255]
+   }
+  },
   "orient.sl": {
    "hash": "f3b299ff",
    "source": "// An anchor: red is uv.x, green is uv.y, so a golden's orientation and its\n// linear-to-sRGB store can be checked against arithmetic, not against itself.\nfloat4 main() { return float4(uv.x, uv.y, 0, 1); }\n",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onejs-sl",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "The OneJS shader language: a small typed language for per pixel programs, compiled to a portable IR and emitted as HLSL, WGSL, GLSL ES or a VM buffer",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/ir.ts

@@ -42,6 +42,27 @@ export const INPUTS = {
 } as const
 export type InputName = keyof typeof INPUTS
 
+/**
+ * Inputs a program can name that are built from the ones above rather than
+ * handed over by the host (`Specs/SL_NEXT.md` 6). Each read records the same
+ * few nodes a program would if it wrote the expression out, and the builder's
+ * hash consing makes every later read the same node. So there is no new
+ * instruction, no VM or host change, and a program that never names one holds
+ * no extra node, compiling to the bytes it always did.
+ *
+ *   texel     1 / resolution: one pixel, in uv
+ *   centered  (uv - 0.5) * float2(aspect, 1): 0 at the centre, circles stay round
+ */
+export const DERIVED_INPUTS = {
+    texel: TYPE.VEC2,
+    centered: TYPE.VEC2,
+} as const
+export type DerivedInputName = keyof typeof DERIVED_INPUTS
+
+/** Every input a program can name: the host's, then the derived ones. */
+export type SourceInputName = InputName | DerivedInputName
+export const SOURCE_INPUTS: Readonly<Record<SourceInputName, SLType>> = { ...INPUTS, ...DERIVED_INPUTS }
+
 /** Index into `Program.nodes`. Always refers backwards. */
 export type NodeRef = number
 

package/src/lang/README.md

@@ -234,7 +234,18 @@ where they were, so the result reads as the shader it came from. What it does:
   same. Shadertoy's `uv = fragCoord / iResolution.xy` line is dropped, since
   that is the input `uv`.
 - `iResolution`, `iMouse`, `iChannel0` to `3` and `uniform sampler2D` become
-  `resolution`, a `mouse` uniform and declared textures. `#define NAME value`
+  `resolution`, a `mouse` uniform and declared textures. The Book of Shaders'
+  `u_time` and `u_resolution`, glslsandbox's `time` and `resolution`, and
+  Shadertoy's own inputs where a tool declares them are the inputs: their
+  `uniform` declarations go, so the shader does not arrive frozen.
+- A mat2 rotation becomes `rotate(p, angle)`: a function or macro returning
+  `mat2(c, -s, s, c)` or `mat2(c, s, -s, c)` of one angle, or the same written
+  in place, wherever a vector is multiplied by it (`p *= rot(a)`,
+  `rot(a) * p`, `p * rot(a)`). The sign of the angle comes from the matrix and
+  from which side the vector is on, since GLSL fills a matrix by columns. The
+  function or macro goes once every use is converted; otherwise it stays, and
+  the notes point at `rotate()`. A file with a `rotate` of its own is left
+  alone, since the calls would reach it. `#define NAME value`
   becomes a const; any other directive is kept as a comment, with a note.
 - A name the language already means something by gets a `_` suffix, and an
   `int` becomes a float (a for-loop counter stays an int), each with a note.

package/src/lang/check.ts

@@ -28,7 +28,7 @@
  * is refused with the reason.
  */
 
-import { INPUTS } from "../ir"
+import { DERIVED_INPUTS, INPUTS } from "../ir"
 import { VM_TEXTURES, VM_UNIFORMS } from "../ops"
 import { SL_GLSL_HINT } from "../ops"
 import { BUILTINS, NOT_YET } from "./builtins"
@@ -37,6 +37,12 @@ import type { Expr, FuncDecl, Stmt, Unit } from "./ast"
 import { SLParseError, type Pos, type SLFix } from "./lexer"
 
 const INPUT_NAMES = new Set(Object.keys(INPUTS))
+/**
+ * Inputs built from the others (`texel`, `centered`). A declaration may take
+ * one's name, as it may a builtin's, because programs wrote their own `texel`
+ * long before the language had one, and that must keep compiling.
+ */
+const DERIVED_NAMES = new Set(Object.keys(DERIVED_INPUTS))
 
 /**
  * The GLSL spellings whose HLSL name means the same wherever it is written, so
@@ -133,13 +139,14 @@ export function check(unit: Unit, prelude: FuncDecl[], options: CheckOptions = {
         if (uniforms.has(n)) return "a uniform"
         if (textures.has(n)) return "a texture"
         if (consts.has(n)) return "a const"
+        if (DERIVED_NAMES.has(n)) return "a derived input"
         return null
     }
 
     /** What a value may not be called: anything spoken for, except a builtin's or a prelude function's name. */
     const valueClash = (n: string): string | null => {
         const why = taken(n)
-        if (why !== null && why !== "a builtin") return why
+        if (why !== null && why !== "a builtin" && why !== "a derived input") return why
         const fn = funcs.get(n)
         return fn !== undefined && !fn.prelude ? "a function" : null
     }
@@ -220,7 +227,7 @@ export function check(unit: Unit, prelude: FuncDecl[], options: CheckOptions = {
         if (main.params.length > 0) {
             fail(
                 "main takes no parameters: what a program is given are the free identifiers uv, " +
-                "fragCoord, resolution, time and aspect",
+                "fragCoord, resolution, time, aspect, texel and centered",
                 main.params[0]!.pos,
             )
         }
@@ -365,7 +372,9 @@ export function check(unit: Unit, prelude: FuncDecl[], options: CheckOptions = {
                     }
                     if (target.k !== "ident") fail("only a local can be assigned to", target.pos)
                     const n = target.name
-                    const why = taken(n)
+                    // A local shadows what it is named after, a builtin or a
+                    // derived input, so it is assignable like any other local.
+                    const why = scope.has(n) ? null : taken(n)
                     if (why !== null) fail(`"${n}" is ${why} and cannot be assigned to`, target.pos, n.length)
                     if (counters.has(n)) {
                         fail(
@@ -423,7 +432,7 @@ export function check(unit: Unit, prelude: FuncDecl[], options: CheckOptions = {
             case "hex":
                 return
             case "ident": {
-                if (scope.has(e.name) || INPUT_NAMES.has(e.name) || uniforms.has(e.name) || consts.has(e.name)) return
+                if (scope.has(e.name) || INPUT_NAMES.has(e.name) || DERIVED_NAMES.has(e.name) || uniforms.has(e.name) || consts.has(e.name)) return
                 if (textures.has(e.name)) {
                     fail(
                         `"${e.name}" is a texture, and a texture is only ever the first argument of ` +
@@ -581,7 +590,7 @@ export function check(unit: Unit, prelude: FuncDecl[], options: CheckOptions = {
     /** Refuses a name nothing declares, offering the nearest one spelled almost like it. */
     function unknown(n: string, scope: Set<string>, pos: Pos): never {
         const near = nearest(n, [
-            ...scope, ...INPUT_NAMES, ...uniforms.keys(), ...textures.keys(), ...consts.keys(),
+            ...scope, ...INPUT_NAMES, ...DERIVED_NAMES, ...uniforms.keys(), ...textures.keys(), ...consts.keys(),
             ...funcs.keys(), ...Object.keys(BUILTINS),
         ])
         if (near === null) fail(`"${n}" is not declared`, pos, n.length)

package/src/lang/classify.ts

@@ -13,7 +13,7 @@
  * wants that should ask it.
  */
 
-import { INPUTS } from "../ir"
+import { SOURCE_INPUTS } from "../ir"
 import { BUILTINS } from "./builtins"
 import { lex } from "./lexer"
 import { PRELUDE_NAMES } from "./prelude-source"
@@ -40,7 +40,7 @@ export interface SLClassifiedToken {
     length: number
 }
 
-const INPUT_NAMES: ReadonlySet<string> = new Set(Object.keys(INPUTS))
+const INPUT_NAMES: ReadonlySet<string> = new Set(Object.keys(SOURCE_INPUTS))
 
 /** The tokens of `source`, comments included, in order, each with its class. */
 export function classify(source: string): SLClassifiedToken[] {

package/src/lang/glsl.ts

@@ -107,6 +107,83 @@ const MISSING: Record<string, string> = {
     dFdx: "there are no derivatives", dFdy: "there are no derivatives", fwidth: "there are no derivatives",
 }
 
+/**
+ * Uniforms other hosts declare for what is an input here: the Book of Shaders'
+ * and glslCanvas's `u_time`, glslsandbox's `time`, and Shadertoy's own when a
+ * tool declares them. The declaration goes and every use reads the input, so a
+ * pasted shader does not arrive frozen on a uniform nothing sets.
+ */
+const HOST_UNIFORMS: Record<string, string> = {
+    u_time: "time", u_resolution: "resolution", time: "time", resolution: "resolution",
+    iTime: "time", iGlobalTime: "time", iResolution: "resolution", iMouse: "mouse",
+}
+
+const QUALIFIERS = new Set(["highp", "mediump", "lowp"])
+/** Words that take a bracket without being called. */
+const CONTROL = new Set(["if", "for", "while", "switch", "return"])
+
+/**
+ * Whether a `mat2(...)`, given its four arguments as words, is a rotation, and
+ * which way: +1 for `mat2(c, s, -s, c)`, the matrix R(a), and -1 for
+ * `mat2(c, -s, s, c)`, which is R(-a) since GLSL fills a matrix by columns.
+ * `cos` and `sin` are the words that stand for the cosine and sine.
+ */
+function rotationSign(matArgs: string[], cos: string[], sin: string[]): 1 | -1 | null {
+    const kind = (w: string) => cos.includes(w) ? "C" : sin.includes(w) ? "S"
+        : w.startsWith("- ") && sin.includes(w.slice(2)) ? "-S" : "?"
+    const k = matArgs.map(kind).join(",")
+    return k === "C,S,-S,C" ? 1 : k === "C,-S,S,C" ? -1 : null
+}
+
+/** Words split at the commas outside any bracket. */
+function splitTop(words: string[]): string[] {
+    const out: string[] = []
+    let depth = 0
+    let cur: string[] = []
+    for (const w of words) {
+        if (w === "(" || w === "[") depth++
+        else if (w === ")" || w === "]") depth--
+        if (w === "," && depth === 0) { out.push(cur.join(" ")); cur = [] } else cur.push(w)
+    }
+    out.push(cur.join(" "))
+    return out
+}
+
+/** The arguments of `mat2 ( ... )` as words, when `words` is exactly that, in any number of brackets. */
+function mat2Args(words: string[]): string[] | null {
+    while (words[0] === "(" && words[words.length - 1] === ")") words = words.slice(1, -1)
+    if (words[0] !== "mat2" || words[1] !== "(" || words[words.length - 1] !== ")") return null
+    const inner = words.slice(2, -1)
+    let depth = 0
+    for (const w of inner) { if (w === "(") depth++; else if (w === ")" && --depth < 0) return null }
+    return splitTop(inner)
+}
+
+/**
+ * The sign of a function body that returns a rotation of its parameter:
+ * `return mat2(cos(a), -sin(a), sin(a), cos(a));`, or the same after
+ * `float c = cos(a), s = sin(a);`. Null for anything else.
+ */
+function rotationBody(words: string[], param: string): 1 | -1 | null {
+    const cos = [`cos ( ${param} )`]
+    const sin = [`sin ( ${param} )`]
+    const statements = words.join(" ").split(/\s*;\s*/).filter((x) => x !== "")
+    const last = statements.pop()
+    const binding = new RegExp(`^(\\w+) = (cos|sin) \\( ${param} \\)$`)
+    for (const st of statements) {
+        const parts = splitTop(st.replace(/^float /, "").split(" "))
+        for (const part of parts) {
+            const m = binding.exec(part)
+            if (m === null) return null
+            if (m[2] === "cos") cos.push(m[1]!)
+            else sin.push(m[1]!)
+        }
+    }
+    if (last === undefined || !last.startsWith("return ")) return null
+    const a = mat2Args(last.slice("return ".length).split(" "))
+    return a === null || a.length !== 4 ? null : rotationSign(a, cos, sin)
+}
+
 /** Names a pasted value or function cannot keep, because the language already means something by them. */
 function taken(name: string, isFunction: boolean): boolean {
     if (name in INPUTS || (SL_KEYWORDS as readonly string[]).includes(name) || (SL_TYPES as readonly string[]).includes(name)) return true
@@ -141,6 +218,61 @@ export function fromGLSL(glsl: string, options: { file?: string } = {}): FromGLS
         }
         return toks.length
     }
+    /** The index of the bracket opening the one at `close`, or -1. */
+    const opening = (close: number): number => {
+        const [o, c] = toks[close]!.text === ")" ? ["(", ")"] : ["[", "]"]
+        let depth = 0
+        for (let i = close; i >= 0; i--) {
+            if (toks[i]!.kind !== "punct") continue
+            if (toks[i]!.text === c) depth++
+            else if (toks[i]!.text === o && --depth === 0) return i
+        }
+        return -1
+    }
+    /** Words for tokens `from` to `to`: no layout, no comments, one space between. */
+    const words = (from: number, to: number) =>
+        toks.slice(from, to).filter((t) => t.kind !== "ws" && t.kind !== "comment").map((t) => t.text)
+    /**
+     * The last token of the operand starting at `i`: a name, a number, a call
+     * or a bracket, then any members and indexes. -1 when it is none of those.
+     */
+    const operandAfter = (i: number): number => {
+        const t = toks[i]
+        let j: number
+        if (t === undefined) return -1
+        if (t.kind === "number") j = i
+        else if (is(i, "(")) j = closing(i)
+        else if (t.kind === "ident") { const n = skip(i + 1); j = is(n, "(") ? closing(n) : i }
+        else return -1
+        for (;;) {
+            if (j >= toks.length) return -1
+            const n = skip(j + 1)
+            if (is(n, ".") && toks[skip(n + 1)]?.kind === "ident") j = skip(n + 1)
+            else if (is(n, "[")) j = closing(n)
+            else return j
+        }
+    }
+    /** The first token of the operand ending at `j`, the same shapes read backwards. -1 when there is none. */
+    const operandBefore = (j: number): number => {
+        let i = j
+        for (;;) {
+            if (is(i, "]")) { const o = opening(i); if (o < 0) return -1; i = back(o - 1); continue }
+            let start: number
+            if (is(i, ")")) {
+                const o = opening(i)
+                if (o < 0) return -1
+                const p = back(o - 1)
+                start = toks[p]?.kind === "ident" && !CONTROL.has(toks[p]!.text) ? p : o
+            } else if (toks[i]?.kind === "ident" || toks[i]?.kind === "number") {
+                start = i
+            } else {
+                return -1
+            }
+            const p = back(start - 1)
+            if (!is(p, ".")) return start
+            i = back(p - 1)
+        }
+    }
     /** A call's arguments, as token ranges, for the call whose "(" is at `open`. */
     const args = (open: number, close: number): Array<[number, number]> => {
         const out: Array<[number, number]> = []
@@ -173,6 +305,142 @@ export function fromGLSL(glsl: string, options: { file?: string } = {}): FromGLS
         if (taken(name, isFunction)) clashes.set(name, name + "_")
     }
 
+    // ---------- what other hosts declare ----------
+
+    /**
+     * Token ranges written as something else, keyed by their first token: a
+     * declaration that goes, a rotation that becomes a call. They nest, and
+     * never cross.
+     */
+    const spans = new Map<number, { end: number; render: (inEntry: boolean) => string }>()
+    const crosses = (start: number, end: number) =>
+        [...spans].some(([s, v]) => (s < start && start <= v.end && v.end < end) || (start < s && s <= end && end < v.end))
+    /** A range and the whitespace after it, gone. */
+    const drop = (start: number, end: number) => {
+        spans.set(start, { end: toks[end + 1]?.kind === "ws" ? end + 1 : end, render: () => "" })
+    }
+
+    const hostUniforms = new Set<string>()
+    for (let i = 0; i < toks.length; i++) {
+        if (!is(i, "uniform")) continue
+        let t = skip(i + 1)
+        while (QUALIFIERS.has(toks[t]?.text ?? "")) t = skip(t + 1)
+        const n = skip(t + 1)
+        const name = toks[n]?.text ?? ""
+        const semi = skip(n + 1)
+        if (toks[n]?.kind !== "ident" || HOST_UNIFORMS[name] === undefined || !is(semi, ";")) continue
+        hostUniforms.add(name)
+        // Its name is the input, not a clash with it.
+        clashes.delete(name)
+        const input = HOST_UNIFORMS[name]!
+        noteOnce("host:" + name, toks[i]!.line, `the uniform ${name} is the input ${input}, so its declaration is dropped`)
+        drop(i, semi)
+    }
+
+    // ---------- rotations ----------
+
+    /**
+     * There are no matrices, and the matrix a shader almost always has is a
+     * rotation: `mat2 rot(float a)` returning `mat2(c, -s, s, c)`, the same as
+     * a macro, or written in place. Each use that multiplies a vector becomes
+     * `rotate(p, angle)`, the angle's sign set by the matrix and by which side
+     * the vector is on, since GLSL's `p * M` is M transposed times p. A
+     * function or macro whose every use is converted goes. Anything else keeps
+     * its `mat2`, which `errors` then points at, with a note naming rotate().
+     */
+    const rotations = new Map<string, { sign: 1 | -1; def: [number, number]; line: number; uses: number; converted: number }>()
+    for (let i = 0; i < toks.length; i++) {
+        const t = toks[i]!
+        if (t.kind === "directive") {
+            const m = /^#\s*define\s+([A-Za-z_]\w*)\(\s*([A-Za-z_]\w*)\s*\)(.*)$/s.exec(t.text)
+            if (m === null) continue
+            const body = tokenize(m[3]!.replace(/\\\n/g, " ")).filter((x) => x.kind !== "ws" && x.kind !== "comment").map((x) => x.text)
+            const a = mat2Args(body)
+            const sign = a === null || a.length !== 4 ? null : rotationSign(a, [`cos ( ${m[2]} )`], [`sin ( ${m[2]} )`])
+            if (sign !== null) rotations.set(m[1]!, { sign, def: [i, i], line: t.line, uses: 0, converted: 0 })
+            continue
+        }
+        if (!is(i, "mat2")) continue
+        const n = skip(i + 1)
+        const open = skip(n + 1)
+        if (toks[n]?.kind !== "ident" || !is(open, "(")) continue
+        const close = closing(open)
+        const params = words(open + 1, close).filter((w) => w !== "in")
+        const body = skip(close + 1)
+        if (params.length !== 2 || params[0] !== "float" || !is(body, "{")) continue
+        const end = closing(body)
+        const sign = rotationBody(words(body + 1, end), params[1]!)
+        if (sign !== null) rotations.set(toks[n]!.text, { sign, def: [i, end], line: t.line, uses: 0, converted: 0 })
+    }
+    // A file with a rotate of its own would have the calls written here call it.
+    const ownRotate = toks.some((t, i) => t.text === "rotate" && t.kind === "ident" && GLSL_TYPES.has(toks[back(i - 1)]?.text ?? "") &&
+        !(rotations.has("rotate") && toks[back(i - 1)]!.text === "mat2"))
+
+    /** The angle, negated when `sign` is -1, as text. */
+    const angle = (range: [number, number], sign: 1 | -1, inEntry: boolean) => {
+        const a = emit(range[0], range[1], inEntry).trim()
+        if (sign === 1) return a
+        if (/^-[\w.]+$/.test(a)) return a.slice(1)
+        return /^[\w.]+$/.test(a) ? `-${a}` : `-(${a})`
+    }
+    for (let i = 0; i < toks.length && !ownRotate; i++) {
+        if (toks[i]!.kind !== "ident" || is(back(i - 1), ".")) continue
+        const open = skip(i + 1)
+        if (!is(open, "(")) continue
+        const close = closing(open)
+        const a = args(open, close)
+        const fn = rotations.get(toks[i]!.text)
+        let sign: 1 | -1 | null = null
+        let range: [number, number] | null = null
+        if (fn !== undefined && (i < fn.def[0] || i > fn.def[1])) {
+            fn.uses++
+            if (a.length === 1) { sign = fn.sign; range = a[0]! }
+        } else if (is(i, "mat2") && a.length === 4) {
+            // In place: the angle is whatever cos() is given.
+            const first = skip(a[0]![0])
+            const inner = skip(first + 1)
+            if (is(first, "cos") && is(inner, "(") && closing(inner) === back(a[0]![1] - 1)) {
+                const x = words(inner + 1, closing(inner)).join(" ")
+                sign = rotationSign(a.map(([x0, x1]) => words(x0, x1).join(" ")), [`cos ( ${x} )`], [`sin ( ${x} )`])
+                range = [inner + 1, closing(inner)]
+            }
+        }
+        if (sign === null || range === null) continue
+        const r = range
+        const s = sign
+        const before = back(i - 1)
+        const after = skip(close + 1)
+        let span: [number, number, (inEntry: boolean) => string] | null = null
+        if (is(before, "=") && is(before - 1, "*") && is(after, ";")) {
+            // p *= M is p = p * M.
+            const lhsEnd = back(before - 2)
+            const lhs = operandBefore(lhsEnd)
+            if (lhs >= 0) span = [lhs, close, (e) => { const p = emit(lhs, lhsEnd + 1, e).trim(); return `${p} = rotate(${p}, ${angle(r, -s as 1 | -1, e)})` }]
+        } else if (is(after, "*") && !is(after + 1, "=") && !["/", "%", "*"].includes(toks[before]?.text ?? "")) {
+            // M * p.
+            const x = skip(after + 1)
+            const xEnd = operandAfter(x)
+            if (xEnd >= 0) span = [i, xEnd, (e) => `rotate(${emit(x, xEnd + 1, e).trim()}, ${angle(r, s, e)})`]
+        } else if (is(before, "*") && !is(after, "*")) {
+            // p * M.
+            const xEnd = back(before - 1)
+            const x = operandBefore(xEnd)
+            if (x >= 0 && !["/", "%"].includes(toks[back(x - 1)]?.text ?? "")) {
+                span = [x, close, (e) => `rotate(${emit(x, xEnd + 1, e).trim()}, ${angle(r, -s as 1 | -1, e)})`]
+            }
+        }
+        if (span === null || crosses(span[0], span[1]) || spans.has(span[0])) continue
+        const [start, end, render] = span
+        spans.set(start, { end, render })
+        noteOnce("rotation", toks[i]!.line, "a mat2 rotation is rotate(p, angle) here, since there are no matrices; the angle's sign follows which side p was multiplied on")
+        if (fn !== undefined) fn.converted++
+    }
+    for (const [name, fn] of rotations) {
+        if (ownRotate || fn.converted !== fn.uses) continue
+        drop(fn.def[0], fn.def[1])
+        note(fn.line, `${name} built a rotation matrix, and each use of it is rotate() now, so it is removed`)
+    }
+
     // ---------- the entry point ----------
 
     let colour = "fragColor"
@@ -231,6 +499,8 @@ export function fromGLSL(glsl: string, options: { file?: string } = {}): FromGLS
         let out = ""
         for (let i = from; i < to; i++) {
             const t = toks[i]!
+            const span = spans.get(i)
+            if (span !== undefined && span.end < to) { out += span.render(inEntry); i = span.end; continue }
             if (t.kind === "directive") { out += directive(t); continue }
             if (t.kind === "number") { out += t.text.replace(/[uU]$/, ""); continue }
             if (t.kind !== "ident") { out += t.text; continue }
@@ -286,6 +556,16 @@ export function fromGLSL(glsl: string, options: { file?: string } = {}): FromGLS
                 out += to2
                 continue
             }
+            if (hostUniforms.has(name) && (name === "u_time" || name === "u_resolution")) { out += HOST_UNIFORMS[name]; continue }
+            if (name === "mat2") {
+                noteOnce("mat2", t.line, "there are no matrices here; a mat2 rotation is rotate(p, angle): p *= mat2(c, -s, s, c) is rotate(p, a), and mat2(c, -s, s, c) * p is rotate(p, -a)")
+                out += name
+                continue
+            }
+            const unconverted = rotations.get(name)
+            if (unconverted !== undefined && called && (i < unconverted.def[0] || i > unconverted.def[1])) {
+                noteOnce("rot:" + t.line + name, t.line, `${name} builds a rotation matrix, and this use of it was not converted; write it as rotate(p, angle)`)
+            }
             if (/^iChannel\d$/.test(name)) { textures.add(name); out += name; continue }
             if (name === "iMouse") {
                 mouse = true

package/src/lang/lower.ts

@@ -33,7 +33,7 @@
  * than an optimisation.
  */
 
-import { INPUTS, type Program, type SLType } from "../ir"
+import { DERIVED_INPUTS, INPUTS, type Program, type SLType } from "../ir"
 import type { SlSdfKind } from "../shapes"
 import * as sl from "../sl"
 import type { Num, Val } from "../sl"
@@ -161,6 +161,17 @@ export function lower(checked: Checked, errors?: SLParseError[]): Program {
             for (const [name, width] of Object.entries(INPUTS)) {
                 global.declare(name, { width: width as SLType, value: (inputs as never)[name] })
             }
+            // Read through, so a program that never names one records nothing
+            // for it. The setter only serves a refused assignment, which the
+            // checker has already reported and lowering carries on past.
+            for (const [name, width] of Object.entries(DERIVED_INPUTS)) {
+                let value: LV | undefined
+                global.declare(name, {
+                    width: width as SLType,
+                    get value() { return value ??= (inputs as never)[name] },
+                    set value(v: LV) { value = v },
+                })
+            }
 
             // Uniforms and textures take their slots in DECLARATION order, before
             // anything is lowered, so a slot is a property of the file rather than

package/src/params.ts

@@ -20,7 +20,7 @@ import { BUILTINS } from "./lang/builtins"
 import { LIB_FUNCTIONS, SDF_CALLS } from "./lib/table"
 import { LIB_PARAM_NAMES } from "./lib/names"
 import { SL_SDF_PARAMS, SL_SDF_SHAPES, type SlSdfKind } from "./shapes"
-import type { InputName } from "./ir"
+import type { SourceInputName } from "./ir"
 
 /** One function of the helper library, as its source declares it. */
 export interface LibSignature {
@@ -169,10 +169,12 @@ export const BUILTIN_DOCS: Readonly<Record<string, string>> = {
  * the output is a UI element in OneJS and an image on a Magerie board, and the
  * clock is whichever one the host runs.
  */
-export const INPUT_DOCS: Readonly<Record<InputName, string>> = {
-    uv: "Where this pixel is in the output, 0 to 1 on each axis, with y up.",
-    fragCoord: "Where this pixel is in the output, in pixels, with y up.",
+export const INPUT_DOCS: Readonly<Record<SourceInputName, string>> = {
+    uv: "The centre of this pixel in the output, 0 to 1 on each axis, with y up.",
+    fragCoord: "The centre of this pixel in the output, in pixels, with y up: the first column is at 0.5.",
     resolution: "The output's size in pixels.",
     time: "The clock, in seconds.",
     aspect: "The output's width divided by its height.",
+    texel: "One pixel, in uv: 1 / resolution. Step by it to read a neighbouring pixel.",
+    centered: "uv with 0 at the centre and x scaled by aspect, so a circle drawn in it stays round.",
 }

package/src/sl.ts

@@ -254,6 +254,10 @@ export interface ProgramInputs {
     resolution: Vec2
     time: Float
     aspect: Float
+    /** One pixel, in uv: `1 / resolution`. Recorded only if read. */
+    texel: Vec2
+    /** `(uv - 0.5) * vec2(aspect, 1)`: 0 at the centre, and a circle stays round. Recorded only if read. */
+    centered: Vec2
 }
 
 /**
@@ -271,6 +275,12 @@ export function program(fn: (inputs: ProgramInputs) => Vec4): Program {
             const ref = b.add({ k: "input", type: width as SLType, name: name as InputName })
             ;(inputs as any)[name] = mk(b, ref, width as SLType)
         }
+        // Getters, so a program that never reads one records nothing for it
+        // (DERIVED_INPUTS in ir.ts). A second read is hash consed to the first.
+        Object.defineProperties(inputs, {
+            texel: { enumerable: true, get: () => vec2(1, 1).div(inputs.resolution) },
+            centered: { enumerable: true, get: () => inputs.uv.sub(0.5).mul(vec2(inputs.aspect, 1)) },
+        })
         const out = fn(inputs)
         if (!(out instanceof Val)) throw new SLError("a program must return an sl value, not " + typeof out)
         if (out.width !== TYPE.VEC4) {

package/src/tables.ts

@@ -13,7 +13,8 @@ export {
     SLOP, SL_ARITY, SL_NAME, SL_HLSL, SL_CALL_NAMES, SL_GLSL_HINT, SL_UNIMPLEMENTED,
 } from "./ops"
 export type { SLSurface } from "./ops"
-export { INPUTS } from "./ir"
+export { DERIVED_INPUTS, INPUTS, SOURCE_INPUTS } from "./ir"
+export type { DerivedInputName, InputName, SourceInputName } from "./ir"
 export { SL_SDF_SHAPES, SL_SDF_PARAMS } from "./shapes"
 export { BUILTIN_DOCS, BUILTIN_PARAMS, INPUT_DOCS, LIB_SIGNATURES, SL_SDF_PARAM_NAMES } from "./params"
 export { PRELUDE_DOCS, PRELUDE_NAMES } from "./lang/prelude-source"