From 2f497adb44eb95c3dedf7cccbdea6005eb232995 Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Wed, 17 Apr 2019 10:33:52 +0200 Subject: [PATCH] Remove MOCKABLE_VIRTUAL from getLibFunc() - this method is called in ctor Change-Id: I8d16ab30c7bf8f886db8369024c1445eeda061ad Signed-off-by: Mateusz Hoppe --- runtime/sharings/va/va_sharing_functions.h | 2 +- unit_tests/sharings/va/mock_va_sharing.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/runtime/sharings/va/va_sharing_functions.h b/runtime/sharings/va/va_sharing_functions.h index ddc3a93867..015ea5c803 100644 --- a/runtime/sharings/va/va_sharing_functions.h +++ b/runtime/sharings/va/va_sharing_functions.h @@ -42,7 +42,7 @@ class VASharingFunctions : public SharingFunctions { return vaSyncSurfacePFN(vaDisplay, vaSurface); } - MOCKABLE_VIRTUAL void *getLibFunc(const char *func) { + void *getLibFunc(const char *func) { if (vaGetLibFuncPFN) { return vaGetLibFuncPFN(vaDisplay, func); } diff --git a/unit_tests/sharings/va/mock_va_sharing.h b/unit_tests/sharings/va/mock_va_sharing.h index 4b65daf4d0..49b62ff118 100644 --- a/unit_tests/sharings/va/mock_va_sharing.h +++ b/unit_tests/sharings/va/mock_va_sharing.h @@ -23,7 +23,6 @@ class VASharingFunctionsMock : public VASharingFunctions { bool deriveImageCalled = false; bool destroyImageCalled = false; bool syncSurfaceCalled = false; - bool getLibFuncCalled = false; bool extGetSurfaceHandleCalled = false; osHandle acquiredVaHandle = 0; @@ -69,11 +68,6 @@ class VASharingFunctionsMock : public VASharingFunctions { syncSurfaceCalled = true; return VA_STATUS_SUCCESS; } - - void *getLibFunc(const char *func) override { - getLibFuncCalled = true; - return nullptr; - } }; class MockVaSharing {