Mesa (master): st/mesa: only define GLSL 1.4 for compat if driver supports it

[Christian Gmeiner]

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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Wed May 16 16:02:54 2018 +0200

st/mesa: only define GLSL 1.4 for compat if driver supports it

Currently GLSL 1.4 is defined for all gallium drivers even only
GLSL 1.2 is supported as seen on etnaviv.

v1 -> v2:
 - use _min(..) as suggested by Lucas Stach and Michel Dänzer

Fixes: 4560aad780b ("mesa: add GLSLVersionCompat constant")
Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Lucas Stach <l.stach at pengutronix.de>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/mesa/state_tracker/st_extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 19ef736e5b..2d56a88027 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -936,7 +936,7 @@ void st_init_extensions(struct pipe_screen *screen,
 
    /* Figure out GLSL support and set GLSLVersion to it. */
    consts->GLSLVersion = screen->get_param(screen, PIPE_CAP_GLSL_FEATURE_LEVEL);
-   consts->GLSLVersionCompat = 140;
+   consts->GLSLVersionCompat = _min(consts->GLSLVersion, 140);
 
    _mesa_override_glsl_version(consts);