From 9de886681ee695935c104f7060cf802e467dbe04 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 19 Mar 2020 14:49:05 +0100 Subject: [PATCH] Remove constant parameter from resource info wrapper interface Change-Id: I9d8994a41098eb76ad60fbdc19472a0504b76536 Signed-off-by: Mateusz Jablonski --- opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp | 4 ++-- opencl/test/unit_test/mocks/mock_gmm_resource_info.h | 2 +- shared/source/gmm_helper/resource_info.h | 2 +- shared/source/os_interface/windows/wddm/wddm.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index a31b969609..ac46f8afe4 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -71,7 +71,7 @@ TEST_F(GmmTests, WhenGmmIsCreatedThenAllResourceAreCreated) { ASSERT_TRUE(gmm->gmmResourceInfo.get() != nullptr); - void *pGmmSysMem = gmm->gmmResourceInfo->getSystemMemPointer(1); + void *pGmmSysMem = gmm->gmmResourceInfo->getSystemMemPointer(); EXPECT_EQ(gmm->resourceParams.Flags.Gpu.NoRestriction, 0u); EXPECT_TRUE(pSysMem == pGmmSysMem); @@ -86,7 +86,7 @@ TEST_F(GmmTests, GivenUncacheableWhenGmmIsCreatedThenAllResourceAreCreated) { ASSERT_TRUE(gmm->gmmResourceInfo.get() != nullptr); - void *pGmmSysMem = gmm->gmmResourceInfo->getSystemMemPointer(1); + void *pGmmSysMem = gmm->gmmResourceInfo->getSystemMemPointer(); EXPECT_EQ(gmm->resourceParams.Flags.Gpu.NoRestriction, 0u); EXPECT_TRUE(pSysMem == pGmmSysMem); EXPECT_EQ(GMM_RESOURCE_USAGE_OCL_BUFFER_CSR_UC, gmm->resourceParams.Usage); diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h index 80b37d346e..bdb33cccd3 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h @@ -74,7 +74,7 @@ class MockGmmResourceInfo : public GmmResourceInfo { MOCK_METHOD1(cpuBlt, uint8_t(GMM_RES_COPY_BLT *resCopyBlt)); - void *getSystemMemPointer(uint8_t isD3DDdiAllocation) override { return (void *)mockResourceCreateParams.pExistingSysMem; } + void *getSystemMemPointer() override { return (void *)mockResourceCreateParams.pExistingSysMem; } MOCK_METHOD1(getUnifiedAuxSurfaceOffset, uint64_t(GMM_UNIFIED_AUX_TYPE auxType)); diff --git a/shared/source/gmm_helper/resource_info.h b/shared/source/gmm_helper/resource_info.h index af4eb7cc5f..2a2164a185 100644 --- a/shared/source/gmm_helper/resource_info.h +++ b/shared/source/gmm_helper/resource_info.h @@ -61,7 +61,7 @@ class GmmResourceInfo { MOCKABLE_VIRTUAL uint8_t cpuBlt(GMM_RES_COPY_BLT *resCopyBlt) { return resourceInfo->CpuBlt(resCopyBlt); } - MOCKABLE_VIRTUAL void *getSystemMemPointer(uint8_t isD3DDdiAllocation) { return resourceInfo->GetSystemMemPointer(isD3DDdiAllocation); } + MOCKABLE_VIRTUAL void *getSystemMemPointer() { return resourceInfo->GetSystemMemPointer(true); } MOCKABLE_VIRTUAL uint32_t getRenderAuxPitchTiles() { return resourceInfo->GetRenderAuxPitchTiles(); } diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index e91ab0c5bd..fb4e4c9d8c 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -529,7 +529,7 @@ NTSTATUS Wddm::createAllocationsAndMapGpuVa(OsHandleStorage &osHandles) { if (osHandles.fragmentStorageData[i].osHandleStorage->handle == (D3DKMT_HANDLE) nullptr && osHandles.fragmentStorageData[i].fragmentSize) { AllocationInfo[allocationCount].pPrivateDriverData = osHandles.fragmentStorageData[i].osHandleStorage->gmm->gmmResourceInfo->peekHandle(); auto pSysMem = osHandles.fragmentStorageData[i].cpuPtr; - auto PSysMemFromGmm = osHandles.fragmentStorageData[i].osHandleStorage->gmm->gmmResourceInfo->getSystemMemPointer(CL_TRUE); + auto PSysMemFromGmm = osHandles.fragmentStorageData[i].osHandleStorage->gmm->gmmResourceInfo->getSystemMemPointer(); DEBUG_BREAK_IF(PSysMemFromGmm != pSysMem); AllocationInfo[allocationCount].pSystemMem = osHandles.fragmentStorageData[i].cpuPtr; AllocationInfo[allocationCount].PrivateDriverDataSize = static_cast(sizeof(GMM_RESOURCE_INFO));