summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2018-11-16 10:28:06 +0100
committerErik Faye-Lund <erik.faye-lund@collabora.com>2018-12-03 18:16:44 +0100
commit43015b2a893c5950e43b2340c14fdbf03c28a79d (patch)
treee5e39de52abaaf7571d81320451cae547b792cab
parent212d270b4e42680cbc5609443b6a0d06c9e6eabb (diff)
mesa/st: do not probe for the same texture-formats twice
This should be equalent of what we did before. Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-rw-r--r--src/mesa/state_tracker/st_extensions.c8
1 files 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;