1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 92c495f716f..ad5ce8a1988 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -361,6 +361,7 @@ static void
 one_time_fini(void)
 {
    _mesa_destroy_shader_compiler();
+   _mesa_destroy_shader_compiler_types();
    _mesa_locale_fini();
 }
 
@@ -393,6 +394,8 @@ one_time_init( struct gl_context *ctx )
 
       _mesa_locale_init();
 
+      _mesa_init_shader_compiler_types();
+
       _mesa_one_time_init_extension_overrides(ctx);
 
       _mesa_get_cpu_features();