summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2019-03-12 14:01:26 +0200
committerDylan Baker <dylan@pnwbakers.com>2019-03-12 09:27:29 -0700
commit7f86fbc2a9c673bb592bedd17a7ae45d0f642383 (patch)
treed58fcbbba2e69ab3c45eb54d8c0a366ba124db14
parent0fe48675e5893d2a6064a0618796452772a69a08 (diff)
downloadmesa-7f86fbc2a9c673bb592bedd17a7ae45d0f642383.tar.gz
mesa-7f86fbc2a9c673bb592bedd17a7ae45d0f642383.tar.bz2
mesa-7f86fbc2a9c673bb592bedd17a7ae45d0f642383.zip
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@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> (cherry picked from commit bef354321b8e55dd68ad1769504f55fb63da1294)
-rw-r--r--src/intel/vulkan/anv_device.c2
1 files changed, 0 insertions, 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);