Module: Mesa Branch: master Commit: a1e9a5d65344bd4d948075cdd0617cab961f9885 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1e9a5d65344bd4d948075cdd0617cab961f9885
Author: Jordan Justen <[email protected]> Date: Sun Feb 28 13:23:07 2021 -0800 i965: Call util_cpu_detect() early in screen creation This helps to avoid this assertion in debug builds: src/util/u_cpu_detect.h:116: util_get_cpu_caps: Assertion `util_cpu_caps.nr_cpus >= 1' failed. Fixes: a9618e7c421 ("util: Add accessor for util_cpu_caps") Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9325> --- src/mesa/drivers/dri/i965/intel_screen.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 5278a565083..72e4f21ffbf 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -45,6 +45,7 @@ #include "utils.h" #include "util/disk_cache.h" #include "util/driconf.h" +#include "util/u_cpu_detect.h" #include "util/u_memory.h" #include "common/gen_defines.h" @@ -2566,6 +2567,8 @@ __DRIconfig **brw_init_screen(__DRIscreen *dri_screen) { struct brw_screen *screen; + util_cpu_detect(); + if (dri_screen->image.loader) { } else if (dri_screen->dri2.loader->base.version <= 2 || dri_screen->dri2.loader->getBuffersWithFormat == NULL) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
