Mesa (19.0): anv: revert "anv: release memory allocated by glsl types during spirv_to_nir"

[GitLab Mirror]

Module: Mesa
Branch: 19.0
Commit: 7f86fbc2a9c673bb592bedd17a7ae45d0f642383
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f86fbc2a9c673bb592bedd17a7ae45d0f642383

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Mar 12 14:01:26 2019 +0200

anv: revert "anv: release memory allocated by glsl types during spirv_to_nir"

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 <tapani.palli at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
(cherry picked from commit bef354321b8e55dd68ad1769504f55fb63da1294)

---

 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 f35d10f56e0..f0583d22774 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"
 
@@ -704,7 +703,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);