Skip to content

Commit

Permalink
Updated to latest CEPL that requires fully qualified shaders.
Browse files Browse the repository at this point in the history
  • Loading branch information
malcolmstill committed Dec 30, 2016
1 parent 10b9579 commit 1e26421
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion alt-tab-mode.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
(* alpha (s~ (texture texture tex-coord) :w))))

(def-g-> alt-tab-pipeline ()
#'alt-tab-vertex-shader #'alt-tab-frag)
(alt-tab-vertex-shader g-pt) (alt-tab-frag :vec2))

(defmethod render ((mode alt-tab-mode) &optional view-fbo)
(let* ((drawable-surfaces (surfaces mode))
Expand Down
2 changes: 1 addition & 1 deletion desktop-mode.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
(:smooth (tex vert))))

(def-g-> mapping-pipeline ()
#'desktop-mode-vertex-shader #'default-fragment-shader)
(desktop-mode-vertex-shader g-pt) (default-fragment-shader :vec2))

(defmethod render ((surface ulubis-surface) &optional view-fbo)
(when (waylisp:texture surface)
Expand Down
6 changes: 3 additions & 3 deletions render.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
(texture texture tex-coord))

(def-g-> passthrough-shader ()
#'passthrough-vert #'passthrough-frag)
(passthrough-vert g-pt) (passthrough-frag :vec2))

(defun-g default-vertex-shader ((vert g-pt) &uniform (ortho :mat4) (surface-scale :mat4) (surface-translate :mat4))
(values (* ortho surface-translate surface-scale (v! (pos vert) 1))
Expand All @@ -254,7 +254,7 @@
(:smooth (tex vert))))

(def-g-> ulubis-cursor-pipeline ()
#'ulubis-cursor-vertex-shader #'default-fragment-shader)
(ulubis-cursor-vertex-shader g-pt) (default-fragment-shader :vec2))

(defmethod draw-cursor ((surface ulubis-cursor) fbo x y ortho)
(when (waylisp:texture surface)
Expand All @@ -278,7 +278,7 @@
color)

(def-g-> cursor-pipeline ()
#'cursor-vertex-shader #'cursor-fragment-shader)
(cursor-vertex-shader :vec3) (cursor-fragment-shader :vec4))

(defmethod draw-cursor ((cursor (eql nil)) fbo x y ortho)
(let* ((array (make-gpu-array
Expand Down

0 comments on commit 1e26421

Please sign in to comment.