From 1e26421c7041a4e57adbe6f4974aea6c0993ae0c Mon Sep 17 00:00:00 2001 From: Malcolm Still Date: Fri, 30 Dec 2016 22:41:13 +0000 Subject: [PATCH] Updated to latest CEPL that requires fully qualified shaders. --- alt-tab-mode.lisp | 2 +- desktop-mode.lisp | 2 +- render.lisp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alt-tab-mode.lisp b/alt-tab-mode.lisp index cb26e49..0ad6f2d 100644 --- a/alt-tab-mode.lisp +++ b/alt-tab-mode.lisp @@ -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)) diff --git a/desktop-mode.lisp b/desktop-mode.lisp index 247a11b..259ff27 100644 --- a/desktop-mode.lisp +++ b/desktop-mode.lisp @@ -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) diff --git a/render.lisp b/render.lisp index 03193b6..69c0d6c 100644 --- a/render.lisp +++ b/render.lisp @@ -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)) @@ -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) @@ -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