[retro-gtk/wip/aplazas/gl-display] Cleanup and add GLSL filter manifests



commit eec84a73e58219783887082975050c548938aa84
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed Nov 15 09:33:58 2017 +0100

    Cleanup and add GLSL filter manifests

 retro-gtk/glsl-filters/bicubic.filter              |    5 +
 retro-gtk/{shaders => glsl-filters}/bicubic.fs     |    0
 retro-gtk/glsl-filters/crt-simple.filter           |    8 +
 retro-gtk/{shaders => glsl-filters}/crt-simple.fs  |    0
 retro-gtk/{shaders => glsl-filters}/crt-simple.vs  |    0
 .../sharp.fs}                                      |    0
 .../sharp.vs}                                      |    0
 retro-gtk/retro-gl-display.c                       |    4 +-
 retro-gtk/retro-gtk.gresource.xml                  |   17 +--
 retro-gtk/shaders/curvature.fs                     |   21 ---
 retro-gtk/shaders/edge-detection.fs                |   25 ----
 retro-gtk/shaders/scanline.fs                      |   22 ---
 retro-gtk/shaders/shadertoy.fs                     |  146 --------------------
 13 files changed, 23 insertions(+), 225 deletions(-)
---
diff --git a/retro-gtk/glsl-filters/bicubic.filter b/retro-gtk/glsl-filters/bicubic.filter
new file mode 100644
index 0000000..5ace147
--- /dev/null
+++ b/retro-gtk/glsl-filters/bicubic.filter
@@ -0,0 +1,5 @@
+[GLSL Filter]
+Fragment=bicubic.fs
+Authors=hunterk;
+License=GPL-2.0+;
+URL=https://github.com/hizzlekizzle/quark-shaders/tree/master/Bicubic.shader
diff --git a/retro-gtk/shaders/bicubic.fs b/retro-gtk/glsl-filters/bicubic.fs
similarity index 100%
rename from retro-gtk/shaders/bicubic.fs
rename to retro-gtk/glsl-filters/bicubic.fs
diff --git a/retro-gtk/glsl-filters/crt-simple.filter b/retro-gtk/glsl-filters/crt-simple.filter
new file mode 100644
index 0000000..4ab6bc6
--- /dev/null
+++ b/retro-gtk/glsl-filters/crt-simple.filter
@@ -0,0 +1,8 @@
+[GLSL Filter]
+Filter=Linear
+Wrap=Border
+Vertex=crt-simple.vs
+Fragment=crt-simple.fs
+Authors=hunterk;
+License=GPL-2.0+;
+URL=https://github.com/hizzlekizzle/quark-shaders/tree/master/CRT-Simple.shader
diff --git a/retro-gtk/shaders/crt-simple.fs b/retro-gtk/glsl-filters/crt-simple.fs
similarity index 100%
rename from retro-gtk/shaders/crt-simple.fs
rename to retro-gtk/glsl-filters/crt-simple.fs
diff --git a/retro-gtk/shaders/crt-simple.vs b/retro-gtk/glsl-filters/crt-simple.vs
similarity index 100%
rename from retro-gtk/shaders/crt-simple.vs
rename to retro-gtk/glsl-filters/crt-simple.vs
diff --git a/retro-gtk/retro-gl-display-fragment.glsl b/retro-gtk/glsl-filters/sharp.fs
similarity index 100%
rename from retro-gtk/retro-gl-display-fragment.glsl
rename to retro-gtk/glsl-filters/sharp.fs
diff --git a/retro-gtk/retro-gl-display-vertex.glsl b/retro-gtk/glsl-filters/sharp.vs
similarity index 100%
rename from retro-gtk/retro-gl-display-vertex.glsl
rename to retro-gtk/glsl-filters/sharp.vs
diff --git a/retro-gtk/retro-gl-display.c b/retro-gtk/retro-gl-display.c
index 9f01a09..6ad70f8 100644
--- a/retro-gtk/retro-gl-display.c
+++ b/retro-gtk/retro-gl-display.c
@@ -136,13 +136,13 @@ retro_gl_display_realize (RetroGLDisplay *self)
 
   vertex_shader =
     create_shader_from_resource (GL_VERTEX_SHADER,
-                                 "/org/gnome/Retro/shaders/crt-simple.vs",
+                                 "/org/gnome/Retro/glsl-filters/crt-simple.vs",
                                  0,
                                  NULL);
 
   fragment_shader =
     create_shader_from_resource (GL_FRAGMENT_SHADER,
-                                 "/org/gnome/Retro/shaders/crt-simple.fs",
+                                 "/org/gnome/Retro/glsl-filters/crt-simple.fs",
                                  0,
                                  NULL);
 
diff --git a/retro-gtk/retro-gtk.gresource.xml b/retro-gtk/retro-gtk.gresource.xml
index c1c41bb..3ca75a1 100644
--- a/retro-gtk/retro-gtk.gresource.xml
+++ b/retro-gtk/retro-gtk.gresource.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/Retro">
-    <file>retro-gl-display-fragment.glsl</file>
-    <file>retro-gl-display-vertex.glsl</file>
-    <file>shaders/bicubic.fs</file>
-    <file>shaders/crt-simple.fs</file>
-    <file>shaders/crt-simple.vs</file>
-    <file>shaders/curvature.fs</file>
-    <file>shaders/edge-detection.fs</file>
-    <file>shaders/scanline.fs</file>
-    <file>shaders/shadertoy.fs</file>
+    <file>glsl-filters/bicubic.filter</file>
+    <file>glsl-filters/bicubic.fs</file>
+    <file>glsl-filters/crt-simple.filter</file>
+    <file>glsl-filters/crt-simple.fs</file>
+    <file>glsl-filters/crt-simple.vs</file>
+    <file>glsl-filters/sharp.filter</file>
+    <file>glsl-filters/sharp.fs</file>
+    <file>glsl-filters/sharp.vs</file>
   </gresource>
 </gresources>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]