Skip to content

Commit 65a95d9

Browse files
Ensure validation_layer::context has init before usage
Fixes VLCLJ-2304 Signed-off-by: Lisanna Dettwyler <[email protected]>
1 parent 0c6e246 commit 65a95d9

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

source/layers/validation/checkers/parameter_validation/ze_parameter_validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace validation_layer
2525
parameterChecker.zeValidation = zeChecker;
2626
parameterChecker.zetValidation = zetChecker;
2727
parameterChecker.zesValidation = zesChecker;
28-
validation_layer::context.validationHandlers.push_back(&parameterChecker);
28+
validation_layer::context.getInstance().validationHandlers.push_back(&parameterChecker);
2929
}
3030
}
3131

source/layers/validation/checkers/template/zel_template_checker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace validation_layer
2121
templateChecker.zeValidation = zeChecker;
2222
templateChecker.zetValidation = zetChecker;
2323
templateChecker.zesValidation = zesChecker;
24-
validation_layer::context.validationHandlers.push_back(&templateChecker);
24+
validation_layer::context.getInstance().validationHandlers.push_back(&templateChecker);
2525
}
2626
}
2727

source/layers/validation/ze_validation_layer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace validation_layer
1515
{
16-
context_t context;
16+
context_t& context = context_t::getInstance();
1717

1818
///////////////////////////////////////////////////////////////////////////////
1919
context_t::context_t()

source/layers/validation/ze_validation_layer.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ namespace validation_layer
4747
std::vector<validationChecker *> validationHandlers;
4848
std::unique_ptr<HandleLifetimeValidation> handleLifetime;
4949

50+
static context_t& getInstance() {
51+
static context_t instance;
52+
return instance;
53+
}
5054
context_t();
5155
~context_t();
5256
};
5357

54-
extern context_t context;
58+
extern context_t& context;
5559
} // namespace validation_layer

0 commit comments

Comments
 (0)