Mesa (master): dri: set the __DRI_API_OPENGL bit based on max gl compat version

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 7d88413ade2c41054f79b20338253aacf1ac341d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d88413ade2c41054f79b20338253aacf1ac341d

Author: Frank Binns <frank.binns at imgtec.com>
Date:   Fri Jul 31 09:11:47 2015 +0100

dri: set the __DRI_API_OPENGL bit based on max gl compat version

This matches similar behaviour for the __DRI_API_OPENGL_CORE bit.

Signed-off-by: Frank Binns <frank.binns at imgtec.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/common/dri_util.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 884a7e0..d35ac26 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -163,7 +163,9 @@ driCreateNewScreen2(int scrn, int fd,
        }
     }
 
-    psp->api_mask = (1 << __DRI_API_OPENGL);
+    psp->api_mask = 0;
+    if (psp->max_gl_compat_version > 0)
+       psp->api_mask |= (1 << __DRI_API_OPENGL);
     if (psp->max_gl_core_version > 0)
        psp->api_mask |= (1 << __DRI_API_OPENGL_CORE);
     if (psp->max_gl_es1_version > 0)