diff --git a/source/layers/validation/checkers/parameter_validation/ze_parameter_validation.cpp b/source/layers/validation/checkers/parameter_validation/ze_parameter_validation.cpp index c6b9ea45..1170f528 100644 --- 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(¶meterChecker); + validation_layer::context.getInstance().validationHandlers.push_back(¶meterChecker); } } diff --git a/source/layers/validation/checkers/template/zel_template_checker.cpp b/source/layers/validation/checkers/template/zel_template_checker.cpp index 471dbfa6..271798a3 100644 --- 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 index f27acc09..3d91b088 100644 --- 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 index 85e46f0d..307b80e9 100644 --- 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 validationHandlers; std::unique_ptr 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