From 35418f677051b75a9d8b37bafc806303bc3b44ad Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 16 Dec 2019 18:05:21 -0500 Subject: panfrost: Let precompile imply shaderdb This cuts down the number of random environmental variables we need flying around; now PAN_MESA_DEBUG=precompile is sufficient and MIDGARD_MESA_DEBUG=shaderdb will be implied. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- src/gallium/drivers/panfrost/pan_assemble.c | 4 +++- src/gallium/drivers/panfrost/pan_blend_shaders.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/panfrost/pan_assemble.c b/src/gallium/drivers/panfrost/pan_assemble.c index 62a4dd654b6..87127ba945b 100644 --- a/src/gallium/drivers/panfrost/pan_assemble.c +++ b/src/gallium/drivers/panfrost/pan_assemble.c @@ -27,6 +27,7 @@ #include #include "pan_bo.h" #include "pan_context.h" +#include "pan_util.h" #include "compiler/nir/nir.h" #include "nir/tgsi_to_nir.h" @@ -65,7 +66,8 @@ panfrost_shader_compile( .alpha_ref = state->alpha_state.ref_value }; - midgard_compile_shader_nir(s, &program, false, 0, screen->gpu_id); + midgard_compile_shader_nir(s, &program, false, 0, screen->gpu_id, + pan_debug & PAN_DBG_PRECOMPILE); /* Prepare the compiled binary for upload */ int size = program.compiled.size; diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c index 62177ccf7e4..d043d9b84e8 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.c +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c @@ -174,7 +174,7 @@ panfrost_compile_blend_shader( /* Compile the built shader */ midgard_program program; - midgard_compile_shader_nir(shader, &program, true, rt, screen->gpu_id); + midgard_compile_shader_nir(shader, &program, true, rt, screen->gpu_id, false); /* Allow us to patch later */ res.patch_index = program.blend_patch_offset; -- cgit v1.2.3