OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: call FLUSH_VERTICES before changing sampler uniforms

Browse Source 
Fixes: 9545139ce5 "mesa: skip FLUSH_VERTICES() if no samplers were changed"

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6946>
This commit is contained in:
Marek Olšák
2020-09-27 11:19:46 -04:00
committed by Marge Bot
parent 9281dfca3f
commit 0a2117bc9e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/main/uniform_query.cpp
View File

@@ -1203,6 +1203,10 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
/* Mark this bindless sampler as bound to a texture unit. /* Mark this bindless sampler as bound to a texture unit.
*/ */
if (sampler->unit != value || !sampler->bound) { if (sampler->unit != value || !sampler->bound) {
if (!flushed) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM);
flushed = true;
}
sampler->unit = value; sampler->unit = value;
changed = true; changed = true;
} }
@@ -1210,6 +1214,10 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
sh->Program->sh.HasBoundBindlessSampler = true; sh->Program->sh.HasBoundBindlessSampler = true;
} else { } else {
if (sh->Program->SamplerUnits[unit] != value) { if (sh->Program->SamplerUnits[unit] != value) {
if (!flushed) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM);
flushed = true;
}
sh->Program->SamplerUnits[unit] = value; sh->Program->SamplerUnits[unit] = value;
changed = true; changed = true;
} }
@@ -1217,11 +1225,6 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
} }
if (changed) { if (changed) {
if (!flushed) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM);
flushed = true;
}
struct gl_program *const prog = sh->Program; struct gl_program *const prog = sh->Program;
_mesa_update_shader_textures_used(shProg, prog); _mesa_update_shader_textures_used(shProg, prog);
if (ctx->Driver.SamplerUniformChange) if (ctx->Driver.SamplerUniformChange)