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

util: move and adjust the vertex upload heuristic equation from u_vbuf

Browse source 
This will also be used by glthread.

The new equation is optimized for glthread.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4466>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4466>
This commit is contained in:
Marek Olšák 2020-03-22 21:00:18 -04:00
parent d9cb0ec5e6
commit 068a3bf0d7
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/auxiliary/util/u_vbuf.c
View file

@ -1433,8 +1433,7 @@ void u_vbuf_draw_vbo(struct u_vbuf *mgr, const struct pipe_draw_info *info)
* performance. */ * performance. */
if (!info->indirect && if (!info->indirect &&
!new_info.primitive_restart && !new_info.primitive_restart &&
num_vertices > new_info.count * 4 && util_is_vbo_upload_ratio_too_large(new_info.count, num_vertices) &&
new_info.count > 32 &&
!u_vbuf_mapping_vertex_buffer_blocks(mgr)) { !u_vbuf_mapping_vertex_buffer_blocks(mgr)) {
unroll_indices = TRUE; unroll_indices = TRUE;
user_vb_mask &= ~(mgr->nonzero_stride_vb_mask & user_vb_mask &= ~(mgr->nonzero_stride_vb_mask &

20
src/util/u_math.h
View file

@ -783,7 +783,25 @@ util_fpstate_set_denorms_to_zero(unsigned current_fpstate);
void void
util_fpstate_set(unsigned fpstate); util_fpstate_set(unsigned fpstate);
/**
* For indexed draw calls, return true if the vertex count to be drawn is
* much lower than the vertex count that has to be uploaded, meaning
* that the driver should flatten indices instead of trying to upload
* a too big range.
*
* This is used by vertex upload code in u_vbuf and glthread.
*/
static inline bool
util_is_vbo_upload_ratio_too_large(unsigned draw_vertex_count,
unsigned upload_vertex_count)
{
if (draw_vertex_count > 1024)
return upload_vertex_count > draw_vertex_count * 4;
else if (draw_vertex_count > 32)
return upload_vertex_count > draw_vertex_count * 8;
else
return upload_vertex_count > draw_vertex_count * 16;
}
#ifdef __cplusplus #ifdef __cplusplus
} }