[patch] gl: Add a quirk for the GLSL version to use on AMD

gl_Add_a_quirk_for_the_GLSL_version_to_use_on_AMD.patch (text/plain), 1.79 KB, created by Olcay on 2015-12-04 21:11:28 UTC

From f9500607b35de5978cb436448284ce3806d1f8a8 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <[e-mail]>
Date: Fri, 30 Oct 2015 11:27:01 +0000
Subject: [PATCH] gl: Add a quirk for the GLSL version to use on AMD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The AMD Catalyst (fglrx) driver on Linux is far less forgiving than the
Mesa and NVidia ones, and when presented with using GLSL version 1.20 on
a forward-compatible core GL profile, it will bomb out.

We can use a simple driver quirk, and bump up the required version for
GLSL to 1.50 when using GL ≥ 3.2.

https://bugzilla.gnome.org/show_bug.cgi?id=756306
---
 cogl/driver/gl/gl/cogl-driver-gl.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/driver/gl/gl/cogl-driver-gl.c
index 716d1dd..188b354 100644
--- a/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -417,9 +417,23 @@
     }
 
   if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2))
-    /* We want to use version 120 if it is available so that the
-     * gl_PointCoord can be used. */
-    ctx->glsl_version_to_use = 120;
+    {
+      if (ctx->gpu.vendor == COGL_GPU_INFO_VENDOR_ATI)
+        {
+          /* The AMD/ATI fglrx driver requires GLSL 1.50 in order to
+           * use a forward compatible GL3 context.
+           *
+           * See: https://bugzilla.gnome.org/show_bug.cgi?id=756306
+           */
+          ctx->glsl_version_to_use = 150;
+        }
+      else
+        {
+          /* We want to use version 120 if it is available so that the
+           * gl_PointCoord can be used. */
+          ctx->glsl_version_to_use = 120;
+        }
+    }
   else
     ctx->glsl_version_to_use = 110;
 
-- 
2.5.0