From 7ca951d11ade592f125d4030ffc020a0c1640931 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sat, 3 Oct 2020 13:24:30 +1000 Subject: glsl: default to compat shaders in compat profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the shader does not specify "core" or "compatibility" in shaders above 1.40 we were defaulting these shaders to core shaders when in a compat profile. Instead default to compat shaders. This brings us inline with the behaviour of the binary drivers and fixes a crash on start-up for the game Foundation. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3594 Fixes: c7e3d31b0b5f ("glsl: fix compat shaders in GLSL 1.40") Reviewed-by: Marek Olšák Reviewed-by: Zoltán Böszörményi Part-of: (cherry picked from commit 6c8cc9be12dc5d6c0d2386d6addb69d8f2fb5399) --- .pick_status.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.pick_status.json') diff --git a/.pick_status.json b/.pick_status.json index 2cb82f53e78..d2398618e1c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4,7 +4,7 @@ "description": "glsl: default to compat shaders in compat profile", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "c7e3d31b0b5f22299a6bd72655502ce8427b40bf" }, -- cgit v1.2.3