AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: skip redundant uniform updates for glUniformHandle

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6946>
This commit is contained in:
Marek Olšák
2020-09-27 12:36:13 -04:00
committed by Marge Bot
parent b32e20e630
commit bde7fa0cb3
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/uniform_query.cpp
+26 -11
View File
@@ -1683,22 +1683,37 @@ _mesa_uniform_handle(GLint location, GLsizei count, const GLvoid *values,
count = MIN2(count, (int) (uni->array_elements - offset));
}
_mesa_flush_vertices_for_uniforms(ctx, uni);
/* Store the data in the "actual type" backing storage for the uniform.
*/
gl_constant_value *storage;
if (ctx->Const.PackedDriverUniformStorage) {
for (unsigned s = 0; s < uni->num_driver_storage; s++) {
storage = (gl_constant_value *)
uni->driver_storage[s].data + (size_mul * offset * components);
memcpy(storage, values,
sizeof(uni->storage[0]) * components * count * size_mul);
}
} else {
memcpy(&uni->storage[size_mul * components * offset], values,
sizeof(uni->storage[0]) * components * count * size_mul);
bool flushed = false;
for (unsigned s = 0; s < uni->num_driver_storage; s++) {
void *storage = (gl_constant_value *)
uni->driver_storage[s].data + (size_mul * offset * components);
unsigned size = sizeof(uni->storage[0]) * components * count * size_mul;
if (!memcmp(storage, values, size))
continue;
if (!flushed) {
_mesa_flush_vertices_for_uniforms(ctx, uni);
flushed = true;
}
memcpy(storage, values, size);
}
if (!flushed)
return;
} else {
void *storage = &uni->storage[size_mul * components * offset];
unsigned size = sizeof(uni->storage[0]) * components * count * size_mul;
if (!memcmp(storage, values, size))
return;
_mesa_flush_vertices_for_uniforms(ctx, uni);
memcpy(storage, values, size);
_mesa_propagate_uniforms_to_driver_storage(uni, offset, count);
}