From b1288fad3c143698685baeedc40ee979f352e12b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 19 May 2017 12:47:16 +0200 Subject: [PATCH] st/mesa: disable per-context seamless cubemap when using texture handles MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ARB_bindless_texture spec say: "If ARB_seamless_cubemap (or OpenGL 4.0, which includes it) is supported, the per-context seamless cubemap enable is ignored and treated as disabled when using texture handles." "If AMD_seamless_cubemap_per_texture is supported, the seamless cube map texture parameter of the underlying texture does apply when texture handles are used." The per-context seamless cubemap flag should only be enabled for bound textures/samplers. Signed-off-by: Samuel Pitoiset Reviewed-by: Marek Olšák Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_atom_sampler.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index c6d992fbb0e..8c121d54071 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -135,7 +135,6 @@ st_convert_sampler(const struct st_context *st, const struct gl_sampler_object *msamp, struct pipe_sampler_state *sampler) { - struct gl_context *ctx = st->ctx; GLenum texBaseFormat; texBaseFormat = _mesa_texture_base_format(texobj); @@ -226,8 +225,11 @@ st_convert_sampler(const struct st_context *st, sampler->compare_func = st_compare_func_to_pipe(msamp->CompareFunc); } - sampler->seamless_cube_map = - ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless; + /* Only set the seamless cube map texture parameter because the per-context + * enable should be ignored and treated as disabled when using texture + * handles, as specified by ARB_bindless_texture. + */ + sampler->seamless_cube_map = msamp->CubeMapSeamless; } /** @@ -250,6 +252,7 @@ st_convert_sampler_from_unit(const struct st_context *st, st_convert_sampler(st, texobj, msamp, sampler); sampler->lod_bias += ctx->Texture.Unit[texUnit].LodBias; + sampler->seamless_cube_map |= ctx->Texture.CubeMapSeamless; } -- 2.30.2