Merge pull request #15 from AlwinEsch/master

Cleanup

CMakeLists.txt

@@ -1,11 +1,8 @@
+cmake_minimum_required(VERSION 3.5)
 project(screensaver.greynetic)
 
-cmake_minimum_required(VERSION 3.3)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 
-enable_language(CXX)
-
 find_package(Kodi REQUIRED)
 
 if(NOT WIN32)

screensaver.greynetic/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="screensaver.greynetic"
-  version="2.2.0"
+  version="2.2.1"
   name="Greynetic"
   provider-name="spiff">
   <requires>@ADDON_DEPENDS@</requires>

screensaver.greynetic/resources/shaders/GL/frag.glsl

@@ -0,0 +1,10 @@
+#version 150
+
+in vec4 v_color;
+
+out vec4 fragColor;
+
+void main()
+{
+  fragColor = v_color;
+}

screensaver.greynetic/resources/shaders/GL/vert.glsl

@@ -0,0 +1,14 @@
+#version 150
+
+uniform mat4 u_projModelMat;
+
+in vec4 a_position;
+in vec4 a_color;
+
+out vec4 v_color;
+
+void main ()
+{
+  gl_Position = u_projModelMat * a_position;
+  v_color = a_color;
+}

screensaver.greynetic/resources/shaders/frag.glsl → screensaver.greynetic/resources/shaders/GLES/frag.glsl

@@ -1,6 +1,4 @@
-#ifndef GL_ES
-#define lowp
-#endif
+#version 100
 
 varying lowp vec4 v_color;
 

screensaver.greynetic/resources/shaders/vert.glsl → screensaver.greynetic/resources/shaders/GLES/vert.glsl

@@ -1,3 +1,5 @@
+#version 100
+
 uniform mat4 u_projModelMat;
 
 attribute vec4 a_position;

src/GreyNetic.cpp

@@ -263,8 +263,8 @@ CScreensaverGreyNetic::~CScreensaverGreyNetic()
 bool CScreensaverGreyNetic::Start()
 {
 #ifndef WIN32
-  if (!LoadShaderFiles(kodi::GetAddonPath("resources/shaders/vert.glsl"),
-                       kodi::GetAddonPath("resources/shaders/frag.glsl")))
+  if (!LoadShaderFiles(kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/vert.glsl"),
+                       kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/frag.glsl")))
   {
     kodi::Log(ADDON_LOG_ERROR, "Failed to load GL shaders");
     return false;