intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 22:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove some redunant casts in setAdapterInfo

Browse Source 
Change-Id: I96bc52e6870346d35209b345362d4ddd951f90b4
This commit is contained in:
Artur Harasimiuk
2018-03-01 21:50:09 +01:00
committed by sys_ocldev
parent a78111c892
commit 8781bd518e
8 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/global_environment.cpp
View File

@@ -77,7 +77,7 @@ void TestEnvironment::setDefaultDebugVars(
fclDefaultDebugVars = fclDefaults;
igcDefaultDebugVars = igcDefaults;
libraryOS = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
libraryOS = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
}
void TestEnvironment::setMockFileNames(

2
unit_tests/global_environment.h
View File

@@ -28,7 +28,7 @@
using namespace OCLRT;
OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
class TestEnvironment : public ::testing::Environment {
public:

4
unit_tests/os_interface/device_factory_tests.cpp
View File

@@ -31,14 +31,14 @@
using namespace OCLRT;
OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
struct DeviceFactoryTest : public MemoryManagementFixture,
public ::testing::Test {
public:
void SetUp() override {
const HardwareInfo hwInfo = *platformDevices[0];
mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
MemoryManagementFixture::SetUp();
}

4
unit_tests/os_interface/linux/options.cpp
View File

@@ -21,6 +21,8 @@
*/
#include "runtime/os_interface/os_library.h"
#include "common/gtsysinfo.h"
#include "igfxfmid.h"
namespace Os {
///////////////////////////////////////////////////////////////////////////////
@@ -36,6 +38,6 @@ const char *testDllName = "libtest_dynamic_lib.so";
const char *sysFsPciPath = "./test_files";
}
OCLRT::OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo) {
OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo) {
return nullptr;
}

4
unit_tests/os_interface/windows/options.cpp
View File

@@ -21,6 +21,8 @@
*/
#include "runtime/os_interface/os_library.h"
#include "common/gtsysinfo.h"
#include "igfxfmid.h"
namespace Os {
///////////////////////////////////////////////////////////////////////////////
@@ -33,7 +35,7 @@ const char *gdiDllName = "gdi32_mock.dll";
const char *testDllName = "test_dynamic_lib.dll";
}
OCLRT::OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo) {
OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo) {
OCLRT::OsLibrary *mockGdiDll;
mockGdiDll = OCLRT::OsLibrary::load("gdi32_mock.dll");

6
unit_tests/os_interface/windows/wddm_fixture.h
View File

@@ -43,7 +43,7 @@
using namespace OCLRT;
OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
class WddmMock : public Wddm {
struct CallResult {
@@ -390,7 +390,7 @@ class WddmFixture {
public:
virtual void SetUp() {
const HardwareInfo hwInfo = *platformDevices[0];
mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
setSizesFunction = reinterpret_cast<decltype(&MockSetSizes)>(mockGdiDll->getProcAddress("MockSetSizes"));
getSizesFunction = reinterpret_cast<decltype(&GetMockSizes)>(mockGdiDll->getProcAddress("GetMockSizes"));
@@ -443,7 +443,7 @@ class WddmFixtureMock {
public:
virtual void SetUp() {
const HardwareInfo hwInfo = *platformDevices[0];
mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
wddm = new WddmMock();
}

2
unit_tests/os_interface/windows/wddm_tests.cpp
View File

@@ -92,7 +92,7 @@ TEST(WddmTestEnumAdapters, expectTrue) {
HardwareInfo outHwInfo;
const HardwareInfo hwInfo = *platformDevices[0];
OsLibrary *mockGdiDll = setAdapterInfo(reinterpret_cast<const void *>(hwInfo.pPlatform), reinterpret_cast<const void *>(hwInfo.pSysInfo));
OsLibrary *mockGdiDll = setAdapterInfo(hwInfo.pPlatform, hwInfo.pSysInfo);
bool success = Wddm::enumAdapters(0, outHwInfo);
EXPECT_TRUE(success);

2
unit_tests/os_interface/windows/wddm_tests.h
View File

@@ -29,7 +29,7 @@
using namespace OCLRT;
OsLibrary *setAdapterInfo(const void *platform, const void *gtSystemInfo);
OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo);
typedef Test<WddmGmmFixture> WddmTest;