From 26351f1ee31ec54188ab1d6fb0646d97f47738cf Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 16 Sep 2019 08:36:16 +0200 Subject: [PATCH] st/mesa: remove always-true expression MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In case the GLSL version is 130 or higher, we've already enabled ARB_shader_bit_encoding a bit earlier in this same function. So this condition will always be true. Signed-off-by: Erik Faye-Lund Reviewed-by: Tapani Pälli Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_extensions.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 40e51f828de..401a64b62e3 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -1445,7 +1445,6 @@ void st_init_extensions(struct pipe_screen *screen, */ if (GLSLVersion >= 130 && extensions->ARB_uniform_buffer_object && - extensions->ARB_shader_bit_encoding && extensions->NV_primitive_restart && screen->get_shader_param(screen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS) >= 16 && -- 2.30.2