Signed-off-by: Edward O'Callaghan <eocallag...@alterapraxis.com>
---
src/mesa/state_tracker/st_extensions.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/state_tracker/st_extensions.c
b/src/mesa/state_tracker/st_extensions.c
index 2fdaba0..b03f531 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -854,7 +854,7 @@ void st_init_extensions(struct pipe_screen *screen,
_mesa_override_glsl_version(consts);
if (options->force_glsl_version > 0 &&
- options->force_glsl_version <= consts->GLSLVersion) {
+ options->force_glsl_version <= glsl_feature_level) {
consts->ForceGLSLVersion = options->force_glsl_version;
}
@@ -865,12 +865,12 @@ void st_init_extensions(struct pipe_screen *screen,
/* This extension needs full OpenGL 3.2, but we don't know if that's
* supported at this point. Only check the GLSL version. */
- if (consts->GLSLVersion >= 150 &&
+ if (glsl_feature_level >= 150 &&
screen->get_param(screen, PIPE_CAP_TGSI_VS_LAYER_VIEWPORT)) {
extensions->AMD_vertex_shader_layer = GL_TRUE;
}
- if (consts->GLSLVersion >= 130) {
+ if (glsl_feature_level >= 130) {
consts->NativeIntegers = GL_TRUE;
consts->MaxClipPlanes = 8;
@@ -1054,7 +1054,7 @@ void st_init_extensions(struct pipe_screen *screen,
* Assume that ES3 is supported if GLSL 3.30 is supported.
* (OpenGL 3.3 is a requirement for that extension.)
*/
- if (consts->GLSLVersion >= 330 &&
+ if (glsl_feature_level >= 330 &&
/* Requirements for ETC2 emulation. */
screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_TEXTURE_2D, 0,
--
2.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
