From bef354321b8e55dd68ad1769504f55fb63da1294 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 12 Mar 2019 14:01:26 +0200 Subject: [PATCH] anv: revert "anv: release memory allocated by glsl types during spirv_to_nir" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 47fc359822494935852de1e70e4d840b2fe6a25c. Reason is that patch did not take in to account situation where we might have both OpenGL and Vulkan using glsl_types at the same time. Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin --- src/intel/vulkan/anv_device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 3173bd715a8..729cceb3e32 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -41,7 +41,6 @@ #include "git_sha1.h" #include "vk_util.h" #include "common/gen_defines.h" -#include "compiler/glsl_types.h" #include "genxml/gen7_pack.h" @@ -737,7 +736,6 @@ void anv_DestroyInstance( vk_debug_report_instance_destroy(&instance->debug_report_callbacks); - _mesa_glsl_release_types(); _mesa_locale_fini(); vk_free(&instance->alloc, instance); -- 2.30.2