diff options
author | Michel Dänzer <[email protected]> | 2014-09-25 12:23:02 +0900 |
---|---|---|
committer | Michel Dänzer <[email protected]> | 2014-09-26 11:35:52 +0900 |
commit | 4a38b154fd02061d8989f8973fbc10740300bf8b (patch) | |
tree | ba31bf1d48230c6f33455af1d4490f7ea53c558a /src/gallium/drivers/llvmpipe/lp_screen.c | |
parent | cdc4de121564a47cbdac760622b6dc7112e548aa (diff) |
gallivm: More fallout from disabling with LLVM 3.6
The draw module would still try to use gallivm, causing many piglit tests
to fail with an assertion failure. llvmpipe might have been similarly
affected.
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_screen.c')
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index e6597e95ea4..30253222910 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -557,6 +557,9 @@ llvmpipe_create_screen(struct sw_winsys *winsys) return NULL; #endif + if (!lp_jit_screen_init(screen)) + return NULL; + #ifdef DEBUG LP_DEBUG = debug_get_flags_option("LP_DEBUG", lp_debug_flags, 0 ); #endif @@ -588,8 +591,6 @@ llvmpipe_create_screen(struct sw_winsys *winsys) llvmpipe_init_screen_resource_funcs(&screen->base); - lp_jit_screen_init(screen); - screen->num_threads = util_cpu_caps.nr_cpus > 1 ? util_cpu_caps.nr_cpus : 0; #ifdef PIPE_SUBSYSTEM_EMBEDDED screen->num_threads = 0; |