[gtk+] Use GLSL version 110 for OpenGL 2 shaders.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Use GLSL version 110 for OpenGL 2 shaders.
- Date: Tue, 1 Nov 2016 19:27:57 +0000 (UTC)
commit c607d51890f3f768150658255f2f8e8776933161
Author: Juan Pablo Ugarte <ugarte endlessm com>
Date: Tue Nov 1 10:59:05 2016 -0300
Use GLSL version 110 for OpenGL 2 shaders.
According to docs and Intel legacy drivers,
GLSL version 130 is for GL 3.0 not GL 2.0/2.1
Validated files with reference compiler from
https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
gdk/resources/glsl/gl2-texture-2d.fs.glsl | 2 +-
gdk/resources/glsl/gl2-texture-2d.vs.glsl | 4 +---
gdk/resources/glsl/gl2-texture-rect.fs.glsl | 2 +-
gdk/resources/glsl/gl2-texture-rect.vs.glsl | 4 +---
gdk/resources/glsl/gl3-texture-2d.vs.glsl | 2 --
gdk/resources/glsl/gl3-texture-rect.vs.glsl | 2 --
6 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/gdk/resources/glsl/gl2-texture-2d.fs.glsl b/gdk/resources/glsl/gl2-texture-2d.fs.glsl
index d0bacfb..a50dd0c 100644
--- a/gdk/resources/glsl/gl2-texture-2d.fs.glsl
+++ b/gdk/resources/glsl/gl2-texture-2d.fs.glsl
@@ -1,4 +1,4 @@
-#version 130
+#version 110
varying vec2 vUv;
diff --git a/gdk/resources/glsl/gl2-texture-2d.vs.glsl b/gdk/resources/glsl/gl2-texture-2d.vs.glsl
index bf9fdbb..492a10f 100644
--- a/gdk/resources/glsl/gl2-texture-2d.vs.glsl
+++ b/gdk/resources/glsl/gl2-texture-2d.vs.glsl
@@ -1,6 +1,4 @@
-#version 130
-
-uniform sampler2D map;
+#version 110
attribute vec2 position;
attribute vec2 uv;
diff --git a/gdk/resources/glsl/gl2-texture-rect.fs.glsl b/gdk/resources/glsl/gl2-texture-rect.fs.glsl
index fe0b870..08753e7 100644
--- a/gdk/resources/glsl/gl2-texture-rect.fs.glsl
+++ b/gdk/resources/glsl/gl2-texture-rect.fs.glsl
@@ -1,4 +1,4 @@
-#version 130
+#version 110
varying vec2 vUv;
diff --git a/gdk/resources/glsl/gl2-texture-rect.vs.glsl b/gdk/resources/glsl/gl2-texture-rect.vs.glsl
index 834d31d..492a10f 100644
--- a/gdk/resources/glsl/gl2-texture-rect.vs.glsl
+++ b/gdk/resources/glsl/gl2-texture-rect.vs.glsl
@@ -1,6 +1,4 @@
-#version 130
-
-uniform sampler2DRect map;
+#version 110
attribute vec2 position;
attribute vec2 uv;
diff --git a/gdk/resources/glsl/gl3-texture-2d.vs.glsl b/gdk/resources/glsl/gl3-texture-2d.vs.glsl
index 2c61f05..a3a0a54 100644
--- a/gdk/resources/glsl/gl3-texture-2d.vs.glsl
+++ b/gdk/resources/glsl/gl3-texture-2d.vs.glsl
@@ -1,7 +1,5 @@
#version 150
-uniform sampler2D map;
-
in vec2 position;
in vec2 uv;
diff --git a/gdk/resources/glsl/gl3-texture-rect.vs.glsl b/gdk/resources/glsl/gl3-texture-rect.vs.glsl
index 874ef6c..bcf8116 100644
--- a/gdk/resources/glsl/gl3-texture-rect.vs.glsl
+++ b/gdk/resources/glsl/gl3-texture-rect.vs.glsl
@@ -1,7 +1,5 @@
#version 150
-uniform sampler2DRect map;
-
attribute vec2 position;
attribute vec2 uv;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]