[gtk+] gdkgl should use shader version 1.50
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdkgl should use shader version 1.50
- Date: Tue, 10 Feb 2015 03:31:29 +0000 (UTC)
commit 50187ae86dfdb4c5815731da25dc9e57296d28c5
Author: Niels Nesse <nnesse sonic net>
Date: Tue Feb 10 01:11:24 2015 -0800
gdkgl should use shader version 1.50
Using version 1.20 with a forward compatible 3.2 core context is incorrect
since OpenGL 3.2 deprecates shader version 1.20 (See section E.2). The latest
fglrx drivers will not compile these shaders.
https://bugzilla.gnome.org/show_bug.cgi?id=744203
gdk/gdkgl.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
index 4eff0a6..e497ccc 100644
--- a/gdk/gdkgl.c
+++ b/gdk/gdkgl.c
@@ -147,7 +147,7 @@ static void
use_texture_2d_program (GdkGLContextPaintData *paint_data)
{
const char *vertex_shader_code =
- "#version 120\n"
+ "#version 150\n"
"uniform sampler2D map;"
"attribute vec2 position;\n"
"attribute vec2 uv;\n"
@@ -157,7 +157,7 @@ use_texture_2d_program (GdkGLContextPaintData *paint_data)
" vUv = uv;\n"
"}\n";
const char *fragment_shader_code =
- "#version 120\n"
+ "#version 150\n"
"varying vec2 vUv;\n"
"uniform sampler2D map;\n"
"void main() {\n"
@@ -178,7 +178,7 @@ static void
use_texture_rect_program (GdkGLContextPaintData *paint_data)
{
const char *vertex_shader_code =
- "#version 120\n"
+ "#version 150\n"
"uniform sampler2DRect map;"
"attribute vec2 position;\n"
"attribute vec2 uv;\n"
@@ -188,7 +188,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
" vUv = uv;\n"
"}\n";
const char *fragment_shader_code =
- "#version 120\n"
+ "#version 150\n"
"varying vec2 vUv;\n"
"uniform sampler2DRect map;\n"
"void main() {\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]