From 43015b2a893c5950e43b2340c14fdbf03c28a79d Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 16 Nov 2018 10:28:06 +0100 Subject: [PATCH] mesa/st: do not probe for the same texture-formats twice MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This should be equalent of what we did before. Signed-off-by: Erik Faye-Lund Reviewed-by: Marek Olšák --- 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 16889074f66..b0fc824e30c 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -771,10 +771,6 @@ void st_init_extensions(struct pipe_screen *screen, /* Required: render target and sampler support */ static const struct st_extension_format_mapping rendertarget_mapping[] = { - { { o(ARB_texture_float) }, - { PIPE_FORMAT_R32G32B32A32_FLOAT, - PIPE_FORMAT_R16G16B16A16_FLOAT } }, - { { o(OES_texture_float) }, { PIPE_FORMAT_R32G32B32A32_FLOAT } }, @@ -1461,6 +1457,10 @@ void st_init_extensions(struct pipe_screen *screen, } } + extensions->ARB_texture_float = + extensions->OES_texture_half_float && + extensions->OES_texture_float; + if (extensions->EXT_texture_filter_anisotropic && screen->get_paramf(screen, PIPE_CAPF_MAX_TEXTURE_ANISOTROPY) >= 16.0) extensions->ARB_texture_filter_anisotropic = GL_TRUE; -- 2.30.2