From: Iago Toral Quiroga Date: Fri, 19 Jul 2019 07:54:54 +0000 (+0200) Subject: v3d: fill logicop_func in the fragment shader key when precompiling shaders X-Git-Tag: upstream/19.3.0~3930 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dacaf7ec06f2b9f4c57e0aff842b8337eb78e8c5;p=platform%2Fupstream%2Fmesa.git v3d: fill logicop_func in the fragment shader key when precompiling shaders Since logicop_func 0 is PIPE_LOGIOP_CLEAR, we were trigger lowerinng of logic ops on precompiled shaders, which we don't want to do. Also, this had the side effect of making shader-db crash, as during this lowering we would try to read the color format swizzle information from the fragment shader key that we don't populate in precompiled shaders because right now we only need it when logic operations are enabled. Reviewed-by: Eric Anholt --- diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c index 78c41c8..bfd1ebd 100644 --- a/src/gallium/drivers/v3d/v3d_program.c +++ b/src/gallium/drivers/v3d/v3d_program.c @@ -200,6 +200,8 @@ v3d_shader_precompile(struct v3d_context *v3d, } } + key.logicop_func = PIPE_LOGICOP_COPY; + v3d_setup_shared_precompile_key(so, &key.base); v3d_get_compiled_shader(v3d, &key.base, sizeof(key)); } else {