From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 21 Sep 2016 03:33:54 +0000 (-0700)
Subject: i965: Enable ES 3.2 on Skylake.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a53da57d5a1f6d72b30693328b809762dbee4c3c;p=mesa.git

i965: Enable ES 3.2 on Skylake.

It's already advertised because the version.c extension checks are
fulfilled, but we didn't actually claim support, so trying to create
a ES 3.2 context would fail.

It's all done, and the CTS results look good, so let's turn it on.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 82d4203a344..d4e34ec4a2d 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1431,6 +1431,7 @@ static void
 set_max_gl_versions(struct intel_screen *screen)
 {
    __DRIscreen *dri_screen = screen->driScrnPriv;
+   const bool has_astc = screen->devinfo->gen >= 9;
 
    switch (screen->devinfo->gen) {
    case 9:
@@ -1438,7 +1439,7 @@ set_max_gl_versions(struct intel_screen *screen)
       dri_screen->max_gl_core_version = 44;
       dri_screen->max_gl_compat_version = 30;
       dri_screen->max_gl_es1_version = 11;
-      dri_screen->max_gl_es2_version = 31;
+      dri_screen->max_gl_es2_version = has_astc ? 32 : 31;
       break;
    case 7:
       dri_screen->max_gl_core_version = 33;