@forgeax/engine-shader 0.1.21 → 0.1.24

package/src/brdf.wgsl

@@ -21,5 +21,119 @@ fn v_smith(nDotV : f32, nDotL : f32, a : f32) -> f32 {
 }
 
 fn f_schlick(vDotH : f32, f0 : vec3<f32>) -> vec3<f32> {
-  return f0 + (vec3<f32>(1.0) - f0) * pow(1.0 - vDotH, 5.0);
+  let fresnel = exp2((-5.55473 * vDotH - 6.98316) * vDotH);
+  return f0 * (vec3<f32>(1.0) - fresnel) + vec3<f32>(fresnel);
+}
+
+
+// Source: Three.js r184 src/nodes/functions/BSDF/DFGLUT.js. The full 16x16
+// RG16F table is decoded to exact f32 constants here; the lookup below mirrors
+// the source DataTexture's linear filtering and clamp-to-edge sampling without
+// adding a host binding or coupling direct light to the engine IBL LUT.
+const THREE_R184_DFG_LUT_SIZE : u32 = 16u;
+const THREE_R184_DFG_LUT : array<vec2<f32>, 256> = array<vec2<f32>, 256>(
+  vec2<f32>(0.1470947265625, 0.85205078125), vec2<f32>(0.16552734375, 0.78759765625), vec2<f32>(0.244384765625, 0.638671875), vec2<f32>(0.370849609375, 0.51953125),
+  vec2<f32>(0.496826171875, 0.41552734375), vec2<f32>(0.60205078125, 0.326416015625), vec2<f32>(0.68408203125, 0.25390625), vec2<f32>(0.74609375, 0.197509765625),
+  vec2<f32>(0.79052734375, 0.154296875), vec2<f32>(0.822265625, 0.12164306640625), vec2<f32>(0.84326171875, 0.09698486328125), vec2<f32>(0.8564453125, 0.07843017578125),
+  vec2<f32>(0.86328125, 0.06439208984375), vec2<f32>(0.86572265625, 0.0537109375), vec2<f32>(0.8642578125, 0.045440673828125), vec2<f32>(0.85986328125, 0.039031982421875),
+  vec2<f32>(0.388671875, 0.611328125), vec2<f32>(0.39306640625, 0.6005859375), vec2<f32>(0.412353515625, 0.5458984375), vec2<f32>(0.45654296875, 0.4482421875),
+  vec2<f32>(0.52783203125, 0.3525390625), vec2<f32>(0.607421875, 0.27392578125), vec2<f32>(0.6787109375, 0.21142578125), vec2<f32>(0.7333984375, 0.16259765625),
+  vec2<f32>(0.77099609375, 0.1253662109375), vec2<f32>(0.79345703125, 0.0972900390625), vec2<f32>(0.80322265625, 0.07623291015625), vec2<f32>(0.8037109375, 0.06036376953125),
+  vec2<f32>(0.79638671875, 0.048431396484375), vec2<f32>(0.78564453125, 0.03936767578125), vec2<f32>(0.77197265625, 0.03240966796875), vec2<f32>(0.7548828125, 0.0269775390625),
+  vec2<f32>(0.572265625, 0.427490234375), vec2<f32>(0.57373046875, 0.424072265625), vec2<f32>(0.57958984375, 0.403564453125), vec2<f32>(0.591796875, 0.3544921875),
+  vec2<f32>(0.6162109375, 0.2880859375), vec2<f32>(0.6552734375, 0.224853515625), vec2<f32>(0.69873046875, 0.172607421875), vec2<f32>(0.7353515625, 0.1318359375),
+  vec2<f32>(0.75927734375, 0.10089111328125), vec2<f32>(0.77001953125, 0.07745361328125), vec2<f32>(0.77197265625, 0.0599365234375), vec2<f32>(0.76611328125, 0.046844482421875),
+  vec2<f32>(0.751953125, 0.0369873046875), vec2<f32>(0.732421875, 0.029541015625), vec2<f32>(0.70947265625, 0.023834228515625), vec2<f32>(0.68359375, 0.019439697265625),
+  vec2<f32>(0.708984375, 0.291015625), vec2<f32>(0.708984375, 0.289794921875), vec2<f32>(0.7099609375, 0.28125), vec2<f32>(0.7099609375, 0.258544921875),
+  vec2<f32>(0.71142578125, 0.220458984375), vec2<f32>(0.7197265625, 0.1768798828125), vec2<f32>(0.734375, 0.1370849609375), vec2<f32>(0.748046875, 0.10479736328125),
+  vec2<f32>(0.755859375, 0.07989501953125), vec2<f32>(0.759765625, 0.061004638671875), vec2<f32>(0.75341796875, 0.046844482421875), vec2<f32>(0.73876953125, 0.036224365234375),
+  vec2<f32>(0.7177734375, 0.02825927734375), vec2<f32>(0.69189453125, 0.0222625732421875), vec2<f32>(0.6611328125, 0.0177001953125), vec2<f32>(0.62841796875, 0.01419830322265625),
+  vec2<f32>(0.80810546875, 0.1917724609375), vec2<f32>(0.8076171875, 0.1912841796875), vec2<f32>(0.80615234375, 0.18798828125), vec2<f32>(0.8017578125, 0.1781005859375),
+  vec2<f32>(0.79296875, 0.15869140625), vec2<f32>(0.78369140625, 0.1322021484375), vec2<f32>(0.775390625, 0.1048583984375), vec2<f32>(0.7685546875, 0.08111572265625),
+  vec2<f32>(0.7646484375, 0.061981201171875), vec2<f32>(0.75537109375, 0.047271728515625), vec2<f32>(0.740234375, 0.036163330078125), vec2<f32>(0.71875, 0.0277557373046875),
+  vec2<f32>(0.69091796875, 0.021484375), vec2<f32>(0.658203125, 0.0167388916015625), vec2<f32>(0.6220703125, 0.01316070556640625), vec2<f32>(0.583984375, 0.01041412353515625),
+  vec2<f32>(0.87841796875, 0.1217041015625), vec2<f32>(0.8779296875, 0.1217041015625), vec2<f32>(0.875, 0.12060546875), vec2<f32>(0.869140625, 0.116943359375),
+  vec2<f32>(0.85693359375, 0.1080322265625), vec2<f32>(0.837890625, 0.09375), vec2<f32>(0.81494140625, 0.076904296875), vec2<f32>(0.7958984375, 0.060699462890625),
+  vec2<f32>(0.7763671875, 0.046875), vec2<f32>(0.75634765625, 0.035919189453125), vec2<f32>(0.732421875, 0.0274505615234375), vec2<f32>(0.703125, 0.021026611328125),
+  vec2<f32>(0.6689453125, 0.01617431640625), vec2<f32>(0.63037109375, 0.01251220703125), vec2<f32>(0.58935546875, 0.00974273681640625), vec2<f32>(0.54638671875, 0.007633209228515625),
+  vec2<f32>(0.92626953125, 0.07379150390625), vec2<f32>(0.92578125, 0.07391357421875), vec2<f32>(0.9228515625, 0.07391357421875), vec2<f32>(0.9169921875, 0.0731201171875),
+  vec2<f32>(0.90380859375, 0.06982421875), vec2<f32>(0.88134765625, 0.0631103515625), vec2<f32>(0.85107421875, 0.053802490234375), vec2<f32>(0.8212890625, 0.043701171875),
+  vec2<f32>(0.791015625, 0.034393310546875), vec2<f32>(0.76123046875, 0.026611328125), vec2<f32>(0.72802734375, 0.02044677734375), vec2<f32>(0.69189453125, 0.015655517578125),
+  vec2<f32>(0.65087890625, 0.0120086669921875), vec2<f32>(0.607421875, 0.00925445556640625), vec2<f32>(0.56103515625, 0.0071563720703125), vec2<f32>(0.51416015625, 0.005565643310546875),
+  vec2<f32>(0.95751953125, 0.042327880859375), vec2<f32>(0.95703125, 0.042449951171875), vec2<f32>(0.95458984375, 0.042816162109375), vec2<f32>(0.94921875, 0.043182373046875),
+  vec2<f32>(0.93701171875, 0.04266357421875), vec2<f32>(0.9130859375, 0.040252685546875), vec2<f32>(0.8818359375, 0.035797119140625), vec2<f32>(0.8447265625, 0.0301361083984375),
+  vec2<f32>(0.80615234375, 0.0243377685546875), vec2<f32>(0.76708984375, 0.0191497802734375), vec2<f32>(0.7265625, 0.01485443115234375), vec2<f32>(0.6826171875, 0.01142120361328125),
+  vec2<f32>(0.63623046875, 0.0087738037109375), vec2<f32>(0.5869140625, 0.006740570068359375), vec2<f32>(0.53662109375, 0.005199432373046875), vec2<f32>(0.486083984375, 0.00402069091796875),
+  vec2<f32>(0.9775390625, 0.0226287841796875), vec2<f32>(0.97705078125, 0.0227508544921875), vec2<f32>(0.97509765625, 0.023193359375), vec2<f32>(0.9697265625, 0.0239105224609375),
+  vec2<f32>(0.95947265625, 0.0244903564453125), vec2<f32>(0.93603515625, 0.0241241455078125), vec2<f32>(0.9052734375, 0.02252197265625), vec2<f32>(0.865234375, 0.0197601318359375),
+  vec2<f32>(0.82177734375, 0.016510009765625), vec2<f32>(0.7744140625, 0.0132904052734375), vec2<f32>(0.7265625, 0.01045989990234375), vec2<f32>(0.67626953125, 0.0081329345703125),
+  vec2<f32>(0.6240234375, 0.00627899169921875), vec2<f32>(0.56982421875, 0.004825592041015625), vec2<f32>(0.51513671875, 0.0037136077880859375), vec2<f32>(0.46142578125, 0.0028629302978515625),
+  vec2<f32>(0.98876953125, 0.01107025146484375), vec2<f32>(0.98876953125, 0.01116180419921875), vec2<f32>(0.98681640625, 0.01151275634765625), vec2<f32>(0.98291015625, 0.01221466064453125),
+  vec2<f32>(0.97314453125, 0.01299285888671875), vec2<f32>(0.953125, 0.013519287109375), vec2<f32>(0.9228515625, 0.01328277587890625), vec2<f32>(0.88232421875, 0.01226043701171875),
+  vec2<f32>(0.8349609375, 0.01065826416015625), vec2<f32>(0.783203125, 0.00885009765625), vec2<f32>(0.728515625, 0.007114410400390625), vec2<f32>(0.671875, 0.00560760498046875),
+  vec2<f32>(0.61376953125, 0.004360198974609375), vec2<f32>(0.5546875, 0.0033721923828125), vec2<f32>(0.496337890625, 0.0025997161865234375), vec2<f32>(0.439453125, 0.0020046234130859375),
+  vec2<f32>(0.9951171875, 0.00479888916015625), vec2<f32>(0.9951171875, 0.004863739013671875), vec2<f32>(0.99365234375, 0.005096435546875), vec2<f32>(0.990234375, 0.005603790283203125),
+  vec2<f32>(0.9814453125, 0.0063323974609375), vec2<f32>(0.96435546875, 0.006977081298828125), vec2<f32>(0.93603515625, 0.007297515869140625), vec2<f32>(0.896484375, 0.0071258544921875),
+  vec2<f32>(0.8466796875, 0.00649261474609375), vec2<f32>(0.79150390625, 0.005596160888671875), vec2<f32>(0.7314453125, 0.004627227783203125), vec2<f32>(0.6689453125, 0.0037174224853515625),
+  vec2<f32>(0.60546875, 0.0029296875), vec2<f32>(0.54150390625, 0.00228118896484375), vec2<f32>(0.479248046875, 0.001766204833984375), vec2<f32>(0.419677734375, 0.00136566162109375),
+  vec2<f32>(0.998046875, 0.0017604827880859375), vec2<f32>(0.998046875, 0.0017938613891601562), vec2<f32>(0.99658203125, 0.0019292831420898438), vec2<f32>(0.994140625, 0.002239227294921875),
+  vec2<f32>(0.986328125, 0.0027294158935546875), vec2<f32>(0.9716796875, 0.0032501220703125), vec2<f32>(0.94580078125, 0.00366973876953125), vec2<f32>(0.90771484375, 0.003818511962890625),
+  vec2<f32>(0.8583984375, 0.003681182861328125), vec2<f32>(0.79931640625, 0.0033206939697265625), vec2<f32>(0.7353515625, 0.0028438568115234375), vec2<f32>(0.66748046875, 0.0023441314697265625),
+  vec2<f32>(0.5986328125, 0.0018796920776367188), vec2<f32>(0.5302734375, 0.0014829635620117188), vec2<f32>(0.464111328125, 0.0011587142944335938), vec2<f32>(0.402099609375, 0.0008993148803710938),
+  vec2<f32>(0.99951171875, 0.0005011558532714844), vec2<f32>(0.99951171875, 0.0005154609680175781), vec2<f32>(0.998046875, 0.000583648681640625), vec2<f32>(0.99658203125, 0.0007505416870117188),
+  vec2<f32>(0.9892578125, 0.00101470947265625), vec2<f32>(0.97607421875, 0.001346588134765625), vec2<f32>(0.95263671875, 0.0016527175903320312), vec2<f32>(0.916015625, 0.0018558502197265625),
+  vec2<f32>(0.8671875, 0.0019054412841796875), vec2<f32>(0.8076171875, 0.0018167495727539062), vec2<f32>(0.7392578125, 0.001621246337890625), vec2<f32>(0.6669921875, 0.0013799667358398438),
+  vec2<f32>(0.59326171875, 0.0011358261108398438), vec2<f32>(0.52001953125, 0.0009121894836425781), vec2<f32>(0.450439453125, 0.0007219314575195312), vec2<f32>(0.385986328125, 0.0005650520324707031),
+  vec2<f32>(1.0, 0.00009316205978393555), vec2<f32>(1.0, 0.0000978708267211914), vec2<f32>(0.9990234375, 0.00012540817260742188), vec2<f32>(0.9970703125, 0.00019216537475585938),
+  vec2<f32>(0.99072265625, 0.0003104209899902344), vec2<f32>(0.97900390625, 0.0004699230194091797), vec2<f32>(0.95751953125, 0.0006470680236816406), vec2<f32>(0.92333984375, 0.0007915496826171875),
+  vec2<f32>(0.87548828125, 0.0008769035339355469), vec2<f32>(0.81494140625, 0.0008869171142578125), vec2<f32>(0.744140625, 0.0008325576782226562), vec2<f32>(0.66748046875, 0.0007386207580566406),
+  vec2<f32>(0.58837890625, 0.0006265640258789062), vec2<f32>(0.51123046875, 0.0005168914794921875), vec2<f32>(0.438232421875, 0.0004165172576904297), vec2<f32>(0.37109375, 0.0003311634063720703),
+  vec2<f32>(1.0, 0.000007271766662597656), vec2<f32>(1.0, 0.000008165836334228516), vec2<f32>(0.9990234375, 0.000016987323760986328), vec2<f32>(0.99755859375, 0.00003790855407714844),
+  vec2<f32>(0.9921875, 0.00007593631744384766), vec2<f32>(0.9814453125, 0.00013744831085205078), vec2<f32>(0.96142578125, 0.00020754337310791016), vec2<f32>(0.92919921875, 0.00028014183044433594),
+  vec2<f32>(0.8828125, 0.0003345012664794922), vec2<f32>(0.82177734375, 0.00036263465881347656), vec2<f32>(0.7490234375, 0.00036215782165527344), vec2<f32>(0.66845703125, 0.0003380775451660156),
+  vec2<f32>(0.58544921875, 0.00029969215393066406), vec2<f32>(0.50390625, 0.00025582313537597656), vec2<f32>(0.427001953125, 0.0002117156982421875), vec2<f32>(0.357666015625, 0.00017201900482177734),
+  vec2<f32>(1.0, 0.0), vec2<f32>(1.0, 5.960464477539063e-8), vec2<f32>(0.99951171875, 0.0000012516975402832031), vec2<f32>(0.99755859375, 0.000005304813385009766),
+  vec2<f32>(0.9931640625, 0.000015079975128173828), vec2<f32>(0.98291015625, 0.00002855062484741211), vec2<f32>(0.96435546875, 0.00004744529724121094), vec2<f32>(0.93408203125, 0.00006842613220214844),
+  vec2<f32>(0.88916015625, 0.00008893013000488281), vec2<f32>(0.828125, 0.0001042485237121582), vec2<f32>(0.75390625, 0.00011217594146728516), vec2<f32>(0.67041015625, 0.00011241436004638672),
+  vec2<f32>(0.5830078125, 0.00010627508163452148), vec2<f32>(0.4970703125, 0.00009584426879882812), vec2<f32>(0.4169921875, 0.0000833272933959961), vec2<f32>(0.34521484375, 0.00007051229476928711),
+);
+
+fn sampleThreeR184DfgLut(roughness : f32, dotNV : f32) -> vec2<f32> {
+  let uv = clamp(vec2<f32>(roughness, dotNV), vec2<f32>(0.0), vec2<f32>(1.0));
+  let samplePosition = uv * f32(THREE_R184_DFG_LUT_SIZE) - vec2<f32>(0.5);
+  let base = vec2<i32>(floor(samplePosition));
+  let weight = fract(samplePosition);
+  let last = i32(THREE_R184_DFG_LUT_SIZE - 1u);
+  let lo = clamp(base, vec2<i32>(0), vec2<i32>(last));
+  let hi = clamp(base + vec2<i32>(1), vec2<i32>(0), vec2<i32>(last));
+  let rowLo = mix(
+    THREE_R184_DFG_LUT[u32(lo.y) * THREE_R184_DFG_LUT_SIZE + u32(lo.x)],
+    THREE_R184_DFG_LUT[u32(lo.y) * THREE_R184_DFG_LUT_SIZE + u32(hi.x)],
+    weight.x,
+  );
+  let rowHi = mix(
+    THREE_R184_DFG_LUT[u32(hi.y) * THREE_R184_DFG_LUT_SIZE + u32(lo.x)],
+    THREE_R184_DFG_LUT[u32(hi.y) * THREE_R184_DFG_LUT_SIZE + u32(hi.x)],
+    weight.x,
+  );
+  return mix(rowLo, rowHi, weight.y);
+}
+
+fn threeR184DirectMultiScatter(
+  roughness : f32,
+  nDotV     : f32,
+  nDotL     : f32,
+  F0        : vec3<f32>,
+) -> vec3<f32> {
+  let dfgV = sampleThreeR184DfgLut(roughness, nDotV);
+  let dfgL = sampleThreeR184DfgLut(roughness, nDotL);
+  let fssEssV = F0 * dfgV.x + vec3<f32>(dfgV.y);
+  let fssEssL = F0 * dfgL.x + vec3<f32>(dfgL.y);
+  let emsV = 1.0 - dfgV.x - dfgV.y;
+  let emsL = 1.0 - dfgL.x - dfgL.y;
+  let favg = F0 + (vec3<f32>(1.0) - F0) * 0.047619;
+  let energyLoss = emsV * emsL;
+  let fms = fssEssV * fssEssL * favg
+    / (vec3<f32>(1.0) - energyLoss * favg * favg + vec3<f32>(1e-6));
+  return fms * energyLoss;
 }

package/src/common.wgsl

@@ -142,13 +142,10 @@ fn ditherUnorm8(value : vec3<f32>, pixelPosition : vec2<f32>) -> vec3<f32> {
 // the per-spot perspective `spotLightViewProj` matrices (4 lanes, fragment-read)
 // fold into the View UBO tail instead of a standalone @group(0) binding 9
 // uniform buffer. The standalone binding pushed the fragment-stage uniform
-// buffer count to 12 (view + pointLights + spotLights + shadowParams +
-// shadowCasterCascade + spotLightViewProj on the WebGL2 fallback path),
-// exceeding GLES 3.0's `max_uniform_buffers_per_shader_stage = 11` so the
-// WebGL2 fallback (mobile / WebKit — this feat's compat target) crashed
-// pipeline-layout creation. Folding into the View UBO costs zero new bindings
-// (the count drops back to 11). D-1 rejected the View UBO for the CASTER vertex
-// channel (binding 7) because directional + spot casters both need a light-view
+// buffer count to 12 before the local-light arrays were removed. The current
+// view declares no point/spot light arrays; the spot matrices remain folded
+// into the View UBO with no standalone binding. D-1 rejected the View UBO for
+// the CASTER vertex channel (binding 7) because directional + spot casters both need a light-view
 // matrix in the same frame (same-frame write contention); the FRAGMENT read
 // channel has no such contention — the host writes all <=4 spot matrices once
 // per frame before the forward pass, so the fold is safe. mat4 array align=16:
@@ -207,12 +204,22 @@ struct Mesh {
 #endif
 };
 
+// Retained CPU ProbeBlendRecord ABI: 4 scalar lanes plus 9 vec4 lanes = 160 B.
+// The last lane carries padding for the 27 f32 SH coefficients. Sky residual
+// is derived in lighting-probe.wgsl, never stored as a second fraction.
+struct ProbeBlendRecord {
+  objectKey         : f32,
+  generation        : f32,
+  localBlendFraction : f32,
+  flags             : f32,
+  shPreblend        : array<vec4<f32>, 9>,
+};
+
 // feat-20260519-light-casters-point-spot-pbr M4 / w21 (D-S1 + D-S2 +
 // AC-04 b/c + AC-05 binding declaration). Punctual-light std430 storage
-// types byte-for-byte mirror packPointLight / packSpotLight in
-// `packages/runtime/src/light-buffer-layout.ts`:
+// types use the shared five-row host ABI in `light-buffer-layout.ts`:
 //
-//   PointLight (32 B / 8 floats):
+//   Point/Spot/Rect direct slot (80 B / 20 u32-or-float lanes):
 //     [ 0..2 ] position vec3<f32>
 //     [   3 ] invRangeSquared f32 (Bevy color_inverse_square_range.w; 0
 //             collapses range falloff to a pure 1/d^2 inverse-square law)
@@ -220,7 +227,7 @@ struct Mesh {
 //             color * intensity so the shader avoids the per-fragment mul)
 //     [   7 ] pad f32 = 0
 //
-//   SpotLight (80 B / 20 floats):
+//   The metadata row carries kind, shadow, IES, and Cookie identities.
 //     [ 0..2 ] position vec3<f32>
 //     [   3 ] invRangeSquared f32
 //     [ 4..6 ] colorTimesIntensity vec3<f32>
@@ -229,81 +236,31 @@ struct Mesh {
 //     [ 8..10] direction vec3<f32> (raw outgoing vector; shader reads
 //             via dot(L, -direction) for cone angle test)
 //     [  11 ] cosOuter f32
-//     [12] depthBias f32, [13] normalBias f32, [14] pcfKernelSize f32
-//     [  15 ] shadowAtlasTile i32 (sentinel -1 = unassigned/clipped,
-//             0..3 = spot atlas tile index; feat-20260625 M2/M3 D-4)
-//     [  16 ] shadowIntensity f32 (fraction of sampled shadow to apply)
-//     [17..19] alignment tail padding
+//     Spot row 3: [12] depthBias, [13] normalBias, [14] shadowIntensity,
+//     [15] rollDeg. The unified slot has no separate pcf lane; the current
+//     surface and volume receivers use the stable PCF3 profile.
+//     Rect row 1/2/3: halfWidth, axisY + halfHeight, axisX + zero pad. The
+//     final metadata row carries the kind,
+//     shadow, IES, and Cookie identities.
 //
 // WGSL std430 alignment audit: vec3<f32> alignof=16 / sizeof=12. The
 // f32 lane wedged immediately after each vec3 fills the 4 B remainder
 // (WGSL struct member rule: next.offset = roundUp(prev.offset +
 // prev.size, this.alignof) - for f32 alignof=4 the round-up is a
 // no-op, so position[3] / color[3] / direction[3] sit at byte
-// offsets 12 / 28 / 44 with zero internal padding). PointLight stays
-// 32 B; SpotLight grows from 64 B (feat-20260625 M2/M3 D-4) for the three
-// receiver controls plus `shadowAtlasTile: i32`, then to 80 B for the
-// parity-only `shadowIntensity` lane at byte 64. These struct sizes match the
-// host packers (packPointLight 32 B / packSpotLight 80 B) exactly.
+// offsets 12 / 28 / 44 with zero internal padding). Point, Spot, and Rect all
+// use the unified 80 B host packer; this shared slot is the sole local-light
+// carrier.
 //
-// Header `count: u32` lives in a wrapper struct with the trailing
-// runtime-sized array. Array-of-vec4-aligned-struct alignof = 16, so
-// `slots` starts at byte 16 (count u32 occupies 0..4; bytes 4..16 are
-// implicit padding). This matches `packLightArrayHeader`'s 16 B
-// (count u32 + 12 B pad) layout in light-buffer-layout.ts.
-
-struct PointLight {
-  position            : vec3<f32>,
-  invRangeSquared     : f32,
-  colorTimesIntensity : vec3<f32>,
-  // feat-20260612-point-light-shadows-urp-hdrp M1 / T-M1-8 (plan-strategy §D-2):
-  // Repurposes the prior `pointPadW` (f32 zero-pad) lane as `shadowAtlasLayer`
-  // (i32 sentinel, -1 = no shadow, 0..3 = cube_array atlas layer index for
-  // shadow-casting point lights). Cap = 4 enforced by the PointLightShadow
-  // ECS component cardinality. The shader path samples the cube_array atlas
-  // (binding 5) only when `shadowAtlasLayer >= 0`. Field name is unique to
-  // this struct (no `pad0`/`pad1` collision with the pbr Material struct
-  // under naga_oil writeback substitution).
-  shadowAtlasLayer    : i32,
-};
-
-struct SpotLight {
-  position            : vec3<f32>,
-  invRangeSquared     : f32,
-  colorTimesIntensity : vec3<f32>,
-  cosInner            : f32,
-  direction           : vec3<f32>,
-  cosOuter            : f32,
-  // feat-20260625-spot-light-shadow-mapping M3 / w13 (plan-strategy D-4):
-  // The trailing vec4 transports receiver controls and the tile identity.
-  // Host packSpotLight writes slots 12..14 from the same snapshot; slot 15 is
-  // the i32 shadow tile sentinel and slot 16 carries shadowIntensity.
-  depthBias           : f32,
-  normalBias          : f32,
-  pcfKernelSize       : f32,
-  shadowAtlasTile     : i32,
-  shadowIntensity     : f32,
-};
-
-struct PointLightsArray {
-  count : u32,
-  slots : array<PointLight, 4>,
-};
-
-struct SpotLightsArray {
-  count : u32,
-  slots : array<SpotLight, 4>,
+struct DirectLightSlot {
+  position            : vec4<f32>, // row0: position + inverse range
+  colorTimesIntensity : vec4<f32>, // row1: color + first angular fact
+  direction           : vec4<f32>, // row2: primary axis + second angular fact
+  auxiliary           : vec4<f32>, // row3: auxiliary Rect axis
+  metadata : vec4<u32>,
 };
 
 @group(0) @binding(0) var<uniform> view : View;
-
-#if STORAGE_BUFFER_AVAILABLE == true
-@group(0) @binding(1) var<storage, read> pointLightsBuffer : PointLightsArray;
-@group(0) @binding(2) var<storage, read> spotLightsBuffer  : SpotLightsArray;
-#else
-@group(0) @binding(1) var<uniform> pointLightsBuffer : PointLightsArray;
-@group(0) @binding(2) var<uniform> spotLightsBuffer  : SpotLightsArray;
-#endif
 // feat-20260520-directional-light-shadow-mapping M3 / w16 (D-1 / plan-strategy §8.1):
 // shadowMap + shadowSampler consume @group(0) bindings 3/4 (smallest unused
 // slots adjacent to view UBO at 0). M3 uses 3x3 PCF with textureLoad on
@@ -314,7 +271,7 @@ struct SpotLightsArray {
 // layers=4, depth32float; one cube per shadow-casting point light, cap=4).
 // Binding 6 declares the per-light shadow params buffer (URP only — proj
 // constants for cube depth-ref reconstruction); HDRP rides the same constants
-// on LightSlot pad lanes (.kind_and_pad.wyz) so binding 6 stays unbound on
+// on direct-light metadata so binding 6 stays unbound on
 // the HDRP path. Sample-time gating by PointLight.shadowAtlasLayer >= 0.
 @group(0) @binding(3) var shadowMap       : texture_depth_2d;
 @group(0) @binding(4) var shadowSampler   : sampler_comparison;
@@ -337,7 +294,7 @@ struct SpotLightsArray {
 //   depth-ref reconstruction (research L0.5 + L1.13). Each lane stores the
 //   shader-side reconstruction constants for one shadow-casting point light;
 //   slot N matches `PointLight.shadowAtlasLayer = N`. HDRP rides the same
-//   constants on `LightSlot.kind_and_pad.wyz` so binding 6 stays unbound on
+//   constants on direct-light metadata so binding 6 stays unbound on
 //   the HDRP path.
 #ifdef POINT_SHADOW_AVAILABLE
 @group(0) @binding(5) var shadowAtlas : texture_depth_cube_array;
@@ -410,6 +367,23 @@ struct ShadowCasterCascade {
 // — folded there in feat-20260625 w25 (scope-amend) to keep the WebGL2 fallback
 // fragment uniform-buffer count <= 11; binding 8 is the last view-BG binding.
 @group(0) @binding(8) var spotShadowMap : texture_depth_2d;
+// Extended-lighting resources are a real optional view topology.  The
+// renderer selects the matching material variant and BGL together; keeping
+// these declarations behind the same axis prevents a no-extension variant
+// from consuming texture budget or requiring absent bindings.
+#ifdef EXTENDED_LIGHTING_AVAILABLE
+@group(0) @binding(9) var spotModifierSampler : sampler;
+@group(0) @binding(11) var iesProfileTexture : texture_2d_array<f32>;
+@group(0) @binding(12) var cookieTexture : texture_2d_array<f32>;
+@group(0) @binding(13) var ltcLambertTexture : texture_2d<f32>;
+@group(0) @binding(14) var ltcGgxTexture : texture_2d<f32>;
+// One aspect-correction matrix per Cookie array slice. The matrix is kept in
+// the shared view group so the same projected Cookie semantics are available
+// to both the ordinary and clustered Standard PBR consumers.
+@group(0) @binding(15) var<uniform> cookieMatrices : array<mat4x4<f32>, 32>;
+#endif
+#ifdef PROJECTOR_AVAILABLE
+#ifndef EXTENDED_LIGHTING_AVAILABLE
 // Optional authored SpotLight projector. Surface and volume bind the same
 // accepted TextureAsset view and linear-clamp sampler; an unprojected spot
 // receives the renderer-owned white fallback. The declaration is capability
@@ -417,10 +391,10 @@ struct ShadowCasterCascade {
 // minimum of 16 sampled textures without this optional cookie. Devices that
 // cannot expose the 17th sampled texture select the matching white-projector
 // shader variant and omit these resources from the view BGL.
-#ifdef PROJECTOR_AVAILABLE
 @group(0) @binding(11) var projectorTexture : texture_2d<f32>;
 @group(0) @binding(12) var projectorSampler : sampler;
 #endif
+#endif
 #if STORAGE_BUFFER_AVAILABLE == true
 @group(2) @binding(0) var<storage, read> meshes : array<Mesh>;
 #else