Ensure validation_layer::context has init before usage

Fixes VLCLJ-2304 Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@intel.com>
oneapi-src · Sep 27, 2024 · 8677cef · 8677cef
1 parent 3dfafe0
commit 8677cef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/source/layers/validation/checkers/parameter_validation/ze_parameter_validation.cpp b/source/layers/validation/checkers/parameter_validation/ze_parameter_validation.cpp
@@ -25,7 +25,7 @@ namespace validation_layer
             parameterChecker.zeValidation = zeChecker;
             parameterChecker.zetValidation = zetChecker;
             parameterChecker.zesValidation = zesChecker;
-            validation_layer::context.validationHandlers.push_back(&parameterChecker);
+            validation_layer::context.getInstance().validationHandlers.push_back(&parameterChecker);
         }
     }
 

diff --git a/source/layers/validation/checkers/template/zel_template_checker.cpp b/source/layers/validation/checkers/template/zel_template_checker.cpp
@@ -21,7 +21,7 @@ namespace validation_layer
             templateChecker.zeValidation = zeChecker;
             templateChecker.zetValidation = zetChecker;
             templateChecker.zesValidation = zesChecker;
-            validation_layer::context.validationHandlers.push_back(&templateChecker);
+            validation_layer::context.getInstance().validationHandlers.push_back(&templateChecker);
         }
     }
 

diff --git a/source/layers/validation/ze_validation_layer.cpp b/source/layers/validation/ze_validation_layer.cpp
@@ -13,7 +13,7 @@
 
 namespace validation_layer
 {
-    context_t context;
+    context_t& context = context_t::getInstance();
 
     ///////////////////////////////////////////////////////////////////////////////
     context_t::context_t()

diff --git a/source/layers/validation/ze_validation_layer.h b/source/layers/validation/ze_validation_layer.h
@@ -47,9 +47,13 @@ namespace validation_layer
         std::vector<validationChecker *> validationHandlers;
         std::unique_ptr<HandleLifetimeValidation> handleLifetime;
 
+        static context_t& getInstance() {
+            static context_t instance;
+            return instance;
+        }
         context_t();
         ~context_t();
     };
 
-    extern context_t context;
+    extern context_t& context;
 } // namespace validation_layer