Mesa (master): st/mesa: remove always-true expression

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Sep 16 08:36:16 2019 +0200

st/mesa: remove always-true expression

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 <erik.faye-lund at collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 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 &&