render: shader: Rename <shader-program> to <shader>.

* sly/render.scm
* sly/render/model.scm (null-model): Use 'null-shader'.
* sly/render/shader.scm (<shader-stage>): Rename to <shader>.
  (<shader-program>): Rename to <shader>.
  (vertex-shader?, fragment-shader?): Rename to...
  (vertex-shader-stage?, fragment-shader-stage?): ...these.
  (shader-stage-guardian): New variable.
  (%shader-compiled?, shader-compiled?): Rename to...
  (%shader-stage-compiled?, shader-stage-compiled?): ...these.
  (display-compilation-error): Change 'shader' to 'stage'.
  (compile-shader, set-shader-source, make-shader, make-vertex-shader)
  (make-fragment-shader, load-shader, load-vertex-shader,
  load-fragment-shader): Rename to...
  (compile-shader-stage, set-shader-stage-source, make-shader-stage)
  (make-vertex-shader-stage, make-fragment-shader-stage)
  (load-shader-stage, load-vertex-shader-stage)
  (load-fragment-shader-stage): ...these.
  (shader-program-uniform-location, shader-program-linked?)
  (make-shader-program, load-shader-program, null-shader-program)
  (apply-shader-program):  Rename to...
  (shader-uniform-location, shader-linked?, make-shader, load-shader)
  (null-shader, apply-shader): ...these.
  (with-shader): Delete.
  (uniform-set!): Change 'shader-program' argument to 'shader'.
  (%default-shader): Use 'load-shader'.

1 files changed, 2 insertions, 2 deletions

diff --git a/sly/render.scm b/sly/render.scm
index 47aa862..b6dd3fb 100644
--- a/sly/render.scm
+++ b/sly/render.scm
@@ -206,7 +206,7 @@
               (graphics-uniform-set! gfx
                                      (uniform-name uniform)
                                      (uniform-default uniform)))
-            (shader-program-uniforms shader)))
+            (shader-uniforms shader)))
 
 (define (make-context-switcher getter setter switch)
   (lambda* (gfx x #:optional force)
@@ -234,7 +234,7 @@
 (define set-graphics-shader!
   (make-context-switcher graphics-shader
                          switch-shader
-                         apply-shader-program))
+                         apply-shader))
 
 (define set-graphics-mesh!
   (make-context-switcher graphics-mesh