1 files changed, 2 insertions, 26 deletions
diff --git a/src/amd/vulkan/radv_entrypoints_gen.py b/src/amd/vulkan/radv_entrypoints_gen.py
index d6c49ce54cf..a6e832a0ab5 100644
--- a/src/amd/vulkan/radv_entrypoints_gen.py
+++ b/src/amd/vulkan/radv_entrypoints_gen.py
@@ -128,7 +128,6 @@ if opt_header:
     for type, name, args, num, h in entrypoints:
         print_guard_start(name)
         print "%s radv_%s%s;" % (type, name, args)
-        print "%s radv_validate_%s%s;" % (type, name, args)
         print_guard_end(name)
     exit()
 
@@ -181,7 +180,7 @@ for type, name, args, num, h in entrypoints:
     i += 2 + len(name) + 1
 print "   ;"
 
-# Now generate the table of all entry points and their validation functions
+# Now generate the table of all entry points
 
 print "\nstatic const struct radv_entrypoint entrypoints[] = {"
 for type, name, args, num, h in entrypoints:
@@ -196,7 +195,7 @@ print """
  */
 """
 
-for layer in [ "radv", "validate" ]:
+for layer in [ "radv" ]:
     for type, name, args, num, h in entrypoints:
         print_guard_start(name)
         print "%s %s_%s%s __attribute__ ((weak));" % (type, layer, name, args)
@@ -209,33 +208,10 @@ for layer in [ "radv", "validate" ]:
     print "};\n"
 
 print """
-#ifdef DEBUG
-static bool enable_validate = true;
-#else
-static bool enable_validate = false;
-#endif
-
-/* We can't use symbols that need resolving (like, oh, getenv) in the resolve
- * function. This means that we have to determine whether or not to use the
- * validation layer sometime before that. The constructor function attribute asks
- * the dynamic linker to invoke determine_validate() at dlopen() time which
- * works.
- */
-static void __attribute__ ((constructor))
-determine_validate(void)
-{
-   const char *s = getenv("ANV_VALIDATE");
-
-   if (s)
-      enable_validate = atoi(s);
-}
 
 void * __attribute__ ((noinline))
 radv_resolve_entrypoint(uint32_t index)
 {
-   if (enable_validate && validate_layer.entrypoints[index])
-      return validate_layer.entrypoints[index];
-
    return radv_layer.entrypoints[index];
 }
 """