summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2019-03-27 11:16:15 -0500
committerJason Ekstrand <jason@jlekstrand.net>2019-03-27 11:24:58 -0500
commitce47999ceed7efe010a1b6cc592780514803670a (patch)
treec2ce80aaa54b78fe2fda193a97bb14336a872dbd /src
parentb817d00278a2626a6cf9d74fb6d896e09f0f8be8 (diff)
Revert "anv/radv: release memory allocated by glsl types during spirv_to_nir"
This reverts commit 4e1bbb000cdfe4ba01bee5a6868c54fed7285dae. It turns out that some DXVK apps due to some implementation detail of DXVK or other create and destroy instances in an interleaved way. Freeing the glsl_type memory without being a bit more careful causes use-after-free issues. Looks like we need to try again.
Diffstat (limited to 'src')
-rw-r--r--src/amd/vulkan/radv_device.c2
-rw-r--r--src/intel/vulkan/anv_device.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index bac5855bb96..d26557fd449 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -48,7 +48,6 @@
#include "util/build_id.h"
#include "util/debug.h"
#include "util/mesa-sha1.h"
-#include "compiler/glsl_types.h"
static int
radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
@@ -611,7 +610,6 @@ void radv_DestroyInstance(
VG(VALGRIND_DESTROY_MEMPOOL(instance));
- _mesa_glsl_release_types();
_mesa_locale_fini();
vk_debug_report_instance_destroy(&instance->debug_report_callbacks);
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index e035cd18e25..b0a6e10cabc 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);