fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: move sampler condition for flushing into mesa_flush_vertices_for_uniforms

Browse source 
This is just a code consolidation. It might fix something, not sure.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6946>
This commit is contained in:
Marek Olšák 2020-09-27 11:28:59 -04:00 • committed by Marge Bot
parent 0a2117bc9e
commit d0c66c167d
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/main/uniform_query.cpp
View file

@ -1039,7 +1039,9 @@ _mesa_flush_vertices_for_uniforms(struct gl_context *ctx,
{
/* Opaque uniforms have no storage unless they are bindless */
if (!uni->is_bindless && uni->type->contains_opaque()) {
FLUSH_VERTICES(ctx, 0);
/* Samplers flush on demand and ignore redundant updates. */
if (!uni->type->is_sampler())
FLUSH_VERTICES(ctx, 0);
return;
}
@ -1149,12 +1151,7 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
count = MIN2(count, (int) (uni->array_elements - offset));
}
/* We check samplers for changes and flush if needed in the sampler
* handling code further down, so just skip them here.
*/
if (!uni->type->is_sampler()) {
_mesa_flush_vertices_for_uniforms(ctx, uni);
}
_mesa_flush_vertices_for_uniforms(ctx, uni);
/* Store the data in the "actual type" backing storage for the uniform.
*/