Skip to content

Commit 5ff84b9

Browse files
shankarprashanthdrprajap
authored andcommitted
Move the definition of GMM DLL name macro
Moving the definition to a separate header file. Change-Id: If4995c6f6e188bfe1cb198e47cf94495f11efd73
1 parent d6bac5a commit 5ff84b9

File tree

4 files changed

+32
-8
lines changed

4 files changed

+32
-8
lines changed

Source/GmmLib/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ set(UMD_HEADERS
222222
${HEADERS_}
223223
${BS_DIR_GMMLIB}/inc/External/Common/GmmClientContext.h
224224
${BS_DIR_GMMLIB}/inc/External/Common/GmmLibDll.h
225+
${BS_DIR_GMMLIB}/inc/External/Common/GmmLibDllName.h
225226
)
226227

227228

Source/GmmLib/inc/External/Common/GmmLibDll.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ OTHER DEALINGS IN THE SOFTWARE.
2424
#include "GmmCommonExt.h"
2525
#include "GmmInfo.h"
2626

27-
#ifdef _X64
28-
#define GMM_UMD_DLL "igdgmm64.dll"
29-
#define GMM_ENTRY_NAME "OpenGmm"
30-
#else
31-
#define GMM_UMD_DLL "igdgmm32.dll"
32-
#define GMM_ENTRY_NAME "_OpenGmm@4"
33-
#endif
34-
3527
// Interfaces exported from GMM Lib DLL
3628
typedef struct _GmmExportEntries
3729
{
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*==============================================================================
2+
Copyright(c) 2017 Intel Corporation
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a
5+
copy of this software and associated documentation files(the "Software"),
6+
to deal in the Software without restriction, including without limitation
7+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
and / or sell copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included
12+
in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20+
OTHER DEALINGS IN THE SOFTWARE.
21+
============================================================================*/
22+
#pragma once
23+
24+
#ifdef _WIN64
25+
#define GMM_UMD_DLL "igdgmm64.dll"
26+
#define GMM_ENTRY_NAME "OpenGmm"
27+
#else
28+
#define GMM_UMD_DLL "igdgmm32.dll"
29+
#define GMM_ENTRY_NAME "_OpenGmm@4"
30+
#endif

Source/GmmLib/inc/GmmLib.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ extern "C" {
5959
#include "External/Common/GmmClientContext.h"
6060

6161
#include "External/Common/GmmLibDll.h"
62+
#include "External/Common/GmmLibDllName.h"
6263

6364
#ifdef __GMM_KMD__
6465
#include "External/Windows/GmmHeap.h"

0 commit comments

Comments
 (0)