Module: Mesa Branch: master Commit: b9ecbc3272e82d71477ac67d6966b599ed8af7a4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9ecbc3272e82d71477ac67d6966b599ed8af7a4
Author: Icecream95 <i...@disroot.org> Date: Mon Jan 4 20:44:49 2021 +1300 st/mesa: Use samplers for buffer textures if requested Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzw...@collabora.com> Reviewed-by: Boris Brezillon <boris.brezil...@collabora.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8300> --- src/mesa/state_tracker/st_atom_sampler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 50fd4ecafa2..3ea5a25464e 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -239,7 +239,6 @@ st_convert_sampler_from_unit(const struct st_context *st, texobj = ctx->Texture.Unit[texUnit]._Current; assert(texobj); - assert(texobj->Target != GL_TEXTURE_BUFFER); msamp = _mesa_get_samplerobj(ctx, texUnit); @@ -289,7 +288,8 @@ update_shader_samplers(struct st_context *st, * states that are NULL. */ if (samplers_used & 1 && - ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER) { + (ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER || + st->texture_buffer_sampler)) { st_convert_sampler_from_unit(st, sampler, tex_unit); states[unit] = sampler; } else { _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
