diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2021-02-28 13:23:07 -0800 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2021-02-28 23:12:00 -0800 |
| commit | a3731fd1346231c6f0407ab1b6a5250fd4bfc69d (patch) | |
| tree | 4d82547cc9733d4c9ac4039c93782d480f7320af | |
| parent | 09bddd6ceb61ad1f561d0e3e9615a65acb9a0dfb (diff) | |
i965: Call util_cpu_detect() early in screen creationi965-util_cpu_detect
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 <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |