billhails · billhails · May 27, 2026 · May 27, 2026
diff --git a/docs/RAYLIB_INTEGRATION_REMAINING.md b/docs/RAYLIB_INTEGRATION_REMAINING.md
@@ -53,7 +53,7 @@ shading).
 ### 1.3 Primary implementation surfaces
 
 - `src/builtin_graphics.c` builtin additions.
-- `fn/graphics.fn` ergonomic wrappers.
+- `fn/gfxutils.fn` ergonomic wrappers.
 - New focused demo showing two materials with different parameters.
 
 ### 1.4 Dependencies
@@ -82,7 +82,7 @@ from one scene to multiple scenes and effects.
 
 ### 2.3 Primary implementation surfaces
 
-- `fn/graphics.fn` helper layer first.
+- `fn/gfxutils.fn` helper layer first.
 - `src/builtin_graphics.c` only if additional uniform upload primitives are
   required.
 
@@ -114,7 +114,7 @@ texture usage.
 ### 3.3 Primary implementation surfaces
 
 - `src/builtin_graphics.c` new builtin for sampler binding.
-- `fn/graphics.fn` wrapper with simple call shape.
+- `fn/gfxutils.fn` wrapper with simple call shape.
 
 ### 3.4 Dependencies
 

diff --git a/fn/gfx_2d_primitives_demo.fn b/fn/gfx_2d_primitives_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_2d_primitives_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn loop(angle) {

diff --git a/fn/gfx_3d_demo.fn b/fn/gfx_3d_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_3d_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_3d_mouse_look_demo.fn b/fn/gfx_3d_mouse_look_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_3d_mouse_look_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_audio_demo.fn b/fn/gfx_audio_demo.fn
@@ -4,7 +4,7 @@
 //
 // Uses /home/bill/Music/01.mp3 for playback.
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn clamp_volume(v) {

diff --git a/fn/gfx_camera2d_demo.fn b/fn/gfx_camera2d_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_camera2d_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_demo.fn b/fn/gfx_demo.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_font_demo.fn b/fn/gfx_font_demo.fn
@@ -3,7 +3,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_font_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     link "listutils.fn" as list;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_material_teaspoon_demo.fn b/fn/gfx_material_teaspoon_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_material_teaspoon_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_model_demo.fn b/fn/gfx_model_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_model_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_music_demo.fn b/fn/gfx_music_demo.fn
@@ -4,7 +4,7 @@
 //
 // Uses /home/bill/Music/01.mp3 for playback.
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn clamp_volume(v) {

diff --git a/fn/gfx_render_texture_demo.fn b/fn/gfx_render_texture_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_render_texture_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_sampler_demo.fn b/fn/gfx_sampler_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_sampler_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn loop(shader, tex0, tex1, blend, dir) {

diff --git a/fn/gfx_shader_cache_benchmark.fn b/fn/gfx_shader_cache_benchmark.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 
     fn seed_render_texture(rt) {
         gfx.render_to_texture(rt, gfx.rgb(14, 18, 28), fn () {

diff --git a/fn/gfx_shader_demo.fn b/fn/gfx_shader_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_shader_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn loop(shader, tex, amount, dir) {

diff --git a/fn/gfx_shader_postprocess_demo.fn b/fn/gfx_shader_postprocess_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_shader_postprocess_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn update_osc(value, step, min, max) {

diff --git a/fn/gfx_shadow_demo.fn b/fn/gfx_shadow_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_shadow_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     link "ioutils.fn" as io;
     link "listutils.fn" as list;
     import gfx macro key_held_action;

diff --git a/fn/gfx_teapot_lit_demo.fn b/fn/gfx_teapot_lit_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_teapot_lit_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_teapot_two_lights_demo.fn b/fn/gfx_teapot_two_lights_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_teapot_two_lights_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 

diff --git a/fn/gfx_test.fn b/fn/gfx_test.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 
     fn animate(x) {
         if (gfx.should_close()) {

diff --git a/fn/gfx_texture_demo.fn b/fn/gfx_texture_demo.fn
@@ -3,7 +3,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_texture_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn loop(tex, angle) {

diff --git a/fn/gfx_transform_demo.fn b/fn/gfx_transform_demo.fn
@@ -2,7 +2,7 @@
 //
 // Run: ./bin/fn --include=fn fn/gfx_transform_demo.fn
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_pressed_action;
 
     fn loop(angle) {

diff --git a/fn/graphics.fn → fn/gfxutils.fn b/fn/graphics.fn → fn/gfxutils.fn
@@ -374,7 +374,10 @@ syntax keyHeldActionHead ::= "[" body: Syntax(keyHeldActionClauses) "]" {
     body
 };
 
-syntax keyHeldActionClauses ::= key: Syntax(keyActionKeyExpr) "=>" body: Nest ";" rest: Syntax(keyHeldActionClauses) quote {
+syntax keyHeldActionClauses ::= key: Syntax(keyActionKeyExpr) "=>"
+                                body: Nest ";"
+                                rest: Syntax(keyHeldActionClauses)
+quote {
     if (key_held(unquote(key))) {
         unquote(body)
     } else {
@@ -389,7 +392,10 @@ syntax keyPressedActionHead ::= "[" body: Syntax(keyPressedActionClauses) "]" {
     body
 };
 
-syntax keyPressedActionClauses ::= key: Syntax(keyActionKeyExpr) "=>" body: Nest ";" rest: Syntax(keyPressedActionClauses) quote {
+syntax keyPressedActionClauses ::= key: Syntax(keyActionKeyExpr) "=>"
+                                   body: Nest ";"
+                                   rest: Syntax(keyPressedActionClauses)
+quote {
     if (key_pressed(unquote(key))) {
         unquote(body)
     } else {

diff --git a/tests/fn/fail_gfx_input_action_missing_default.fn b/tests/fn/fail_gfx_input_action_missing_default.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
 
     broken = key_held_action[

diff --git a/tests/fn/fail_gfx_input_action_split_arrow.fn b/tests/fn/fail_gfx_input_action_split_arrow.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
 
     broken = key_held_action[

diff --git a/tests/fn/test_gfx_input_action_macros.fn b/tests/fn/test_gfx_input_action_macros.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
     import gfx macro key_held_action;
     import gfx macro key_pressed_action;
 in

diff --git a/tests/fn/test_gfx_material_phase1_smoke.fn b/tests/fn/test_gfx_material_phase1_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 in
     if (gfx.enabled()) {
         {

diff --git a/tests/fn/test_gfx_render_texture_sampler_smoke.fn b/tests/fn/test_gfx_render_texture_sampler_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 in
     if (gfx.enabled()) {
         {

diff --git a/tests/fn/test_gfx_resource_churn_smoke.fn b/tests/fn/test_gfx_resource_churn_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 
     fn churn_cycle(remaining) {
         if (remaining <= 0) {

diff --git a/tests/fn/test_gfx_sampler_smoke.fn b/tests/fn/test_gfx_sampler_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 
     fn loop_frames(n, shader, tex0, tex1) {
         if (n <= 0) { true }

diff --git a/tests/fn/test_gfx_shader_reload_smoke.fn b/tests/fn/test_gfx_shader_reload_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 
     fn seed_render_texture(rt, tex) {
         gfx.render_to_texture(rt, gfx.rgb(10, 12, 18), fn () {

diff --git a/tests/fn/test_gfx_shader_smoke.fn b/tests/fn/test_gfx_shader_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 in
     if (gfx.enabled()) {
         {

diff --git a/tests/fn/test_gfx_shadow_smoke.fn b/tests/fn/test_gfx_shadow_smoke.fn
@@ -1,5 +1,5 @@
 let
-    link "graphics.fn" as gfx;
+    link "gfxutils.fn" as gfx;
 
     fn draw_scene(model) {
         assert(gfx.draw_plane(gfx.vec3(0, 0, 0), gfx.vec3(12, 0, 12), gfx.rgb(44, 58, 82)));