Skip to content

Commit fa821af

Browse files
chesik-amdchesik-amd
committed
GPA 3.0 preview
1 parent 33bed9d commit fa821af

File tree

314 files changed

+497595
-175317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+497595
-175317
lines changed

‎BUILD.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,20 @@ GPUPerfAPI no longer uses git submodules to reference dependent repositories. In
1111
order to clone/update any dependent repositories.
1212

1313
#### Prerequisites
14-
* This step requires that python be installed on the system. Python can be installed from https://www.python.org/
14+
* Python, which can be installed from https://www.python.org/
1515

1616
#### Instructions
1717
* Simply execute the [UpdateCommon.py](Scripts/UpdateCommon.py) python script located in the [Scripts](Scripts) directory:
1818
* `python Scripts/UpdateCommon.py`
19-
This script will clone any dependent repositories that are not present on the system. If any of the dependent repositories are already
19+
* This script will clone any dependent repositories that are not present on the system. If any of the dependent repositories are already
2020
present on the system, this script will instead do a "git pull" on those repositories to ensure that they are up to date. Please re-run
2121
this script everytime you pull new changes from GPA repository.
22+
* This script will also download and execute the Vulkan SDK installer.
23+
* On Windows, running the installer may require elevation. If you've previously installed the required Vulkan version, UpdateCommon will simply copy the files form the default installation location into the correct place into the GPUPerfAPI directory tree.
24+
* UpdateCommon is set up to install the version of the Vulkan SDK which was used during development. If you want to use a newer version of the SDK, the following files will need to be updated:
25+
* [UpdateCommonMap.py](Scripts/UpdateCommonMap.py)
26+
* Linux-specific: [Common.mk](GPA/Build/Linux/Common.mk)
27+
* Windows-specific: Common/Lib/Ext/Global-Vulkan.props
2228

2329
## Windows Build Information
2430

‎Build/Linux/Common.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ COMMON_LIB_EXT=$(COMMON_DIR)/Lib/Ext
5151
GTEST_DIR = $(COMMON_LIB_EXT)/GoogleTest/1-7
5252
GL_DIR = $(COMMON_LIB_EXT)/OpenGL
5353
GLES_DIR = $(COMMON_LIB_EXT)/OpenGLES
54-
GLEW_DIR = $(COMMON_LIB_EXT)/glew/1.9.0
5554
GLES_LIB_DIR = -L$(GLES_DIR)/Lib/$(GLES_PLATFORM_DIR)
5655
GTEST_DIR = $(COMMON_LIB_EXT)/GoogleTest/1-7
5756
GTEST_LIBS = $(GTEST_DIR)/lib/gcc5/x64/libgtest.a
5857
GTEST_LIBS32 = $(GTEST_DIR)/lib/gcc5/x86/libgtest.a
58+
VK_SDK_DIR = $(COMMON_LIB_EXT)/Vulkan/VulkanSDK/1.0.49.0/x86_64
59+
VK_INCLUDE_DIR = $(VK_SDK_DIR)/include
60+
AMD_VK_EXT_DIR = $(COMMON_SRC)/AmdVkExt
5961

6062
# Lib paths
6163
COMMON_LIB_PATHS = -L$(GPACOMMON_DIR) -L$(GPACG_DIR)

‎Build/Linux/build.sh

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@ DEBUG_SUFFIX=
2828
# HSA directory override
2929
HSA_DIR_OVERRIDE=
3030

31+
# Vulkan include directory override
32+
VK_INC_DIR_OVERRIDE=
33+
3134
# API-specific build control
3235
bBuildOpenGL=true
3336
bBuildOpenGLES=true
37+
bBuildVK=true
3438
bBuildOpenCL=true
3539
bBuildHSA=true
3640

@@ -68,10 +72,15 @@ do
6872
elif [ "$1" = "hsadir" ]; then
6973
shift
7074
HSA_DIR_OVERRIDE="HSA_DIR=$1"
75+
elif [ "$1" = "vkincdir" ]; then
76+
shift
77+
VK_INC_DIR_OVERRIDE="VK_INCLUDE_DIR=$1"
7178
elif [ "$1" = "skipopengl" ]; then
7279
bBuildOpenGL=false
7380
elif [ "$1" = "skipopengles" ]; then
7481
bBuildOpenGLES=false
82+
elif [ "$1" = "skipvulkan" ]; then
83+
bBuildOpenVK=false
7584
elif [ "$1" = "skipopencl" ]; then
7685
bBuildOpenCL=false
7786
elif [ "$1" = "skiphsa" ]; then
@@ -101,6 +110,7 @@ CL=$GPASRC/GPUPerfAPICL
101110
HSA=$GPASRC/GPUPerfAPIHSA
102111
GL=$GPASRC/GPUPerfAPIGL
103112
GLES=$GPASRC/GPUPerfAPIGLES
113+
VK=$GPASRC/GPUPerfAPIVk
104114
COUNTERS=$GPASRC/GPUPerfAPICounters
105115
COUNTERGENERATOR=$GPASRC/GPUPerfAPICounterGenerator
106116
GPA_COMMON=$GPASRC/GPUPerfAPI-Common
@@ -109,6 +119,7 @@ UNITTESTS=$GPASRC/GPUPerfAPIUnitTests
109119

110120
GLLIB=libGPUPerfAPIGL$DEBUG_SUFFIX.so
111121
GLESLIB=libGPUPerfAPIGLES$DEBUG_SUFFIX.so
122+
VKLIB=libGPUPerfAPIVK$DEBUG_SUFFIX.so
112123
CLLIB=libGPUPerfAPICL$DEBUG_SUFFIX.so
113124
HSALIB=libGPUPerfAPIHSA$DEBUG_SUFFIX.so
114125
COUNTERSLIB=libGPUPerfAPICounters$DEBUG_SUFFIX.so
@@ -118,6 +129,7 @@ GPA_DEVICEINFOLIB=libDeviceInfo$DEBUG_SUFFIX.a
118129

119130
GLLIB32=libGPUPerfAPIGL32$DEBUG_SUFFIX.so
120131
GLESLIB32=libGPUPerfAPIGLES32$DEBUG_SUFFIX.so
132+
VKLIB32=libGPUPerfAPIVK32$DEBUG_SUFFIX.so
121133
CLLIB32=libGPUPerfAPICL32$DEBUG_SUFFIX.so
122134
COUNTERSLIB32=libGPUPerfAPICounters32$DEBUG_SUFFIX.so
123135
COUNTERGENERATORLIB32=libGPUPerfAPICounterGenerator32$DEBUG_SUFFIX.a
@@ -126,6 +138,7 @@ GPA_DEVICEINFOLIB32=libDeviceInfo32$DEBUG_SUFFIX.a
126138

127139
GLLIB_INTERNAL=libGPUPerfAPIGL$DEBUG_SUFFIX-Internal.so
128140
GLESLIB_INTERNAL=libGPUPerfAPIGLES$DEBUG_SUFFIX-Internal.so
141+
VKLIB_INTERNAL=libGPUPerfAPIVK$DEBUG_SUFFIX-Internal.so
129142
CLLIB_INTERNAL=libGPUPerfAPICL$DEBUG_SUFFIX-Internal.so
130143
HSALIB_INTERNAL=libGPUPerfAPIHSA$DEBUG_SUFFIX-Internal.so
131144
COUNTERSLIB_INTERNAL=libGPUPerfAPICounters$DEBUG_SUFFIX-Internal.so
@@ -135,6 +148,7 @@ GPA_DEVICEINFOLIB_INTERNAL=libDeviceInfo$DEBUG_SUFFIX-Internal.a
135148

136149
GLLIB32_INTERNAL=libGPUPerfAPIGL32$DEBUG_SUFFIX-Internal.so
137150
GLESLIB32_INTERNAL=libGPUPerfAPIGLES32$DEBUG_SUFFIX-Internal.so
151+
VKLIB32_INTERNAL=libGPUPerfAPIVK32$DEBUG_SUFFIX-Internal.so
138152
CLLIB32_INTERNAL=libGPUPerfAPICL32$DEBUG_SUFFIX-Internal.so
139153
COUNTERSLIB32_INTERNAL=libGPUPerfAPICounters32$DEBUG_SUFFIX-Internal.so
140154
COUNTERGENERATORLIB32_INTERNAL=libGPUPerfAPICounterGenerator32$DEBUG_SUFFIX-Internal.a
@@ -169,6 +183,10 @@ if $bBuildOpenGLES ; then
169183
BUILD_DIRS="$BUILD_DIRS $GLES"
170184
fi
171185

186+
if $bBuildOpenVK ; then
187+
BUILD_DIRS="$BUILD_DIRS $VK"
188+
fi
189+
172190
if $bBuildOpenCL ; then
173191
BUILD_DIRS="$BUILD_DIRS $CL"
174192
fi
@@ -192,14 +210,14 @@ for SUBDIR in $BUILD_DIRS; do
192210
#make 64 bit
193211
echo "Build ${BASENAME}, 64-bit..." | tee -a $LOGFILE
194212

195-
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET} >> $LOGFILE 2>&1; then
213+
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET} >> $LOGFILE 2>&1; then
196214
echo "Failed to build ${BASENAME}, 64 bit"
197215
exit 1
198216
fi
199217

200218
#make 64 bit Internal
201219
if $bBuildInternal ; then
202-
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internal >> $LOGFILE 2>&1; then
220+
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internal >> $LOGFILE 2>&1; then
203221
echo "Failed to build ${BASENAME}, 64 bit, Internal"
204222
exit 1
205223
fi
@@ -210,14 +228,14 @@ for SUBDIR in $BUILD_DIRS; do
210228
#make 32 bit
211229
echo "Build ${BASENAME}, 32-bit..." | tee -a $LOGFILE
212230

213-
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}x86 >> $LOGFILE 2>&1; then
231+
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}x86 >> $LOGFILE 2>&1; then
214232
echo "Failed to build ${BASENAME}, 32 bit"
215233
exit 1
216234
fi
217235

218236
#make 32 bit Internal
219237
if $bBuildInternal ; then
220-
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internalx86 >> $LOGFILE 2>&1; then
238+
if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internalx86 >> $LOGFILE 2>&1; then
221239
echo "Failed to build ${BASENAME}, 32 bit, Internal"
222240
exit 1
223241
fi
@@ -243,21 +261,20 @@ if $bZip ; then
243261
cp $HSA/$HSALIB ./Bin/Linx64/
244262
cp $GL/$GLLIB ./Bin/Linx64/
245263
cp $GLES/$GLESLIB ./Bin/Linx64/
264+
cp $VK/$VKLIB ./Bin/Linx64/
246265
cp $CL/$CLLIB32 ./Bin/Linx86/
247266
cp $GL/$GLLIB32 ./Bin/Linx86/
248267
cp $GLES/$GLESLIB32 ./Bin/Linx86/
268+
cp $VK/$VKLIB32 ./Bin/Linx86/
249269
cp $COUNTERS/$COUNTERSLIB ./Bin/Linx64/
250270
cp $COUNTERS/$COUNTERSLIB32 ./Bin/Linx86/
251271
mkdir Include
252272
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI.h ./Include/
253273
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPIFunctionTypes.h ./Include/
254274
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPITypes.h ./Include/
255-
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI-Private.h ./Include/
256-
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPIFunctionTypes-Private.h ./Include/
257-
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPITypes-Private.h ./Include/
258275
cp ../../../Src/GPUPerfAPI-Common/GPAFunctions.h ./Include/
259276
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI-HSA.h ./Include/
260-
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPIOS.h ./Include/
277+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI-VK.h ./Include/
261278
cp ../../../Src/GPUPerfAPICounters/GPUPerfAPICounters.h ./Include/
262279
cp ../../../Src/GPUPerfAPICounterGenerator/GPACounterGenerator.h ./Include/
263280
cp ../../../Src/GPUPerfAPICounterGenerator/GPAICounterAccessor.h ./Include/
@@ -282,11 +299,13 @@ if $bZip ; then
282299
cp $HSA/$HSALIB_INTERNAL ./Bin-Internal/Linx64/
283300
cp $GL/$GLLIB_INTERNAL ./Bin-Internal/Linx64/
284301
cp $GLES/$GLESLIB_INTERNAL ./Bin-Internal/Linx64/
302+
cp $VK/$VKLIB_INTERNAL ./Bin-Internal/Linx64/
285303
cp $COUNTERS/$COUNTERSLIB_INTERNAL ./Bin-Internal/Linx64/
286304

287305
cp $CL/$CLLIB32_INTERNAL ./Bin-Internal/Linx86/
288306
cp $GL/$GLLIB32_INTERNAL ./Bin-Internal/Linx86/
289307
cp $GLES/$GLESLIB32_INTERNAL ./Bin-Internal/Linx86/
308+
cp $VK/$VKLIB32_INTERNAL ./Bin-Internal/Linx86/
290309
cp $COUNTERS/$COUNTERSLIB32_INTERNAL ./Bin-Internal/Linx86/
291310

292311
cd ..

‎Build/VS2015/GPA-Common.props

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportGroup Label="PropertySheets">
4-
<Import Project="GPA-Properties.props" />
5-
<Import Project="..\..\..\Common\Src\Vsprops\Global-Common.props" />
6-
<Import Project="..\..\..\Common\Src\DeviceInfo\Global-DeviceInfo.props" />
7-
<Import Project="..\..\..\Common\Lib\Ext\Windows-Kits\Global-WindowsSDK.props" />
8-
<Import Project="..\..\..\Common\Lib\AMD\APPSDK\Global-OpenCL-NoLib.props" />
9-
<Import Project="..\..\..\Common\Lib\Ext\OpenGL\Global-OpenGL.props" />
10-
<Import Project="..\..\..\Common\Lib\Ext\OpenGLES\Global-OpenGLES.props" />
11-
<Import Condition="'$(SolutionName)'!='GPUPerfAPI'" Project="..\..\..\Common\Lib\AMD\HSA\Global-HSAFoundation-NoLib.props" />
12-
<Import Project="..\..\..\Common\Src\ADLUtil\Global-ADLUtil.props" />
13-
<Import Project="..\..\..\Common\Src\GPUPerfAPIUtils\Global-GPUPerfAPIUtils.props" />
14-
<Import Project="..\..\..\Common\Src\AMDTMutex\Global-AMDTMutex.props" />
15-
<Import Project="..\..\..\Common\Src\AmdDxExt\Global-AmdDxExt.props" />
16-
<Import Project="..\..\..\Common\Src\DynamicLibraryModule\Global-DynamicLibraryModule.props" />
17-
</ImportGroup>
18-
<PropertyGroup Label="Globals">
19-
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
20-
</PropertyGroup>
21-
<PropertyGroup Label="UserMacros">
22-
<MyBinDir>$(AMDTOutDir)$(Configuration)-$(Platform)$(AMDT_BUILD_SUFFIX)</MyBinDir>
23-
<AMDTCRT>MT</AMDTCRT>
24-
</PropertyGroup>
25-
<PropertyGroup>
26-
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
27-
</PropertyGroup>
28-
<ItemDefinitionGroup>
29-
<ClCompile>
30-
<PreprocessorDefinitions>USE_POINTER_SINGLETON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
31-
<WholeProgramOptimization>false</WholeProgramOptimization>
32-
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsDebug)))">MultiThreadedDebug</RuntimeLibrary>
33-
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsRelease)))">MultiThreaded</RuntimeLibrary>
34-
</ClCompile>
35-
<Link>
36-
<OutputFile>$(OutDir)$(AMDTProjectName).exe</OutputFile>
37-
</Link>
38-
</ItemDefinitionGroup>
39-
<ItemGroup>
40-
<BuildMacro Include="MyBinDir">
41-
<Value>$(MyBinDir)</Value>
42-
</BuildMacro>
43-
<BuildMacro Include="AMDTCRT">
44-
<Value>$(AMDTCRT)</Value>
45-
</BuildMacro>
46-
</ItemGroup>
47-
</Project>
3+
<ImportGroup Label="PropertySheets">
4+
<Import Project="GPA-Properties.props" />
5+
<Import Project="..\..\..\Common\Src\Vsprops\Global-Common.props" />
6+
<Import Project="..\..\..\Common\Src\DeviceInfo\Global-DeviceInfo.props" />
7+
<Import Project="..\..\..\Common\Lib\Ext\Windows-Kits\Global-WindowsSDK.props" />
8+
<Import Project="..\..\..\Common\Lib\AMD\APPSDK\Global-OpenCL-NoLib.props" />
9+
<Import Project="..\..\..\Common\Lib\Ext\OpenGL\Global-OpenGL.props" />
10+
<Import Project="..\..\..\Common\Lib\Ext\OpenGLES\Global-OpenGLES.props" />
11+
<Import Condition="'$(SolutionName)'!='GPUPerfAPI'" Project="..\..\..\Common\Lib\AMD\HSA\Global-HSAFoundation-NoLib.props" />
12+
<Import Project="..\..\..\Common\Src\ADLUtil\Global-ADLUtil.props" />
13+
<Import Project="..\..\..\Common\Src\GPUPerfAPIUtils\Global-GPUPerfAPIUtils.props" />
14+
<Import Project="..\..\..\Common\Src\AMDTMutex\Global-AMDTMutex.props" />
15+
<Import Project="..\..\..\Common\Src\AmdDxExt\Global-AmdDxExt.props" />
16+
<Import Project="..\..\..\Common\Src\DynamicLibraryModule\Global-DynamicLibraryModule.props" />
17+
<Import Project="..\..\..\Common\Src\AmdVkExt\Global-AmdVkExt.props" />
18+
</ImportGroup>
19+
<PropertyGroup Label="Globals">
20+
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
21+
</PropertyGroup>
22+
<PropertyGroup Label="UserMacros">
23+
<MyBinDir>$(AMDTOutDir)$(Configuration)-$(Platform)$(AMDT_BUILD_SUFFIX)</MyBinDir>
24+
<AMDTCRT>MT</AMDTCRT>
25+
</PropertyGroup>
26+
<PropertyGroup>
27+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
28+
</PropertyGroup>
29+
<ItemDefinitionGroup>
30+
<ClCompile>
31+
<PreprocessorDefinitions>USE_POINTER_SINGLETON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
32+
<WholeProgramOptimization>false</WholeProgramOptimization>
33+
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsDebug)))">MultiThreadedDebug</RuntimeLibrary>
34+
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsRelease)))">MultiThreaded</RuntimeLibrary>
35+
</ClCompile>
36+
<Link>
37+
<OutputFile>$(OutDir)$(AMDTProjectName).exe</OutputFile>
38+
</Link>
39+
</ItemDefinitionGroup>
40+
<ItemGroup>
41+
<BuildMacro Include="MyBinDir">
42+
<Value>$(MyBinDir)</Value>
43+
</BuildMacro>
44+
<BuildMacro Include="AMDTCRT">
45+
<Value>$(AMDTCRT)</Value>
46+
</BuildMacro>
47+
</ItemGroup>
48+
</Project>

‎Build/VS2015/GPUPerfAPI-Common.vcxproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@
3333
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPADataRequest.h" />
3434
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAFunctions.h" />
3535
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAHWInfo.h" />
36+
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAInterfaceLoader.h" />
3637
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPASessionRequests.h" />
37-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPI-Private.h" />
3838
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPI.h" />
39-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIFunctionTypes-Private.h" />
4039
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIFunctionTypes.h" />
4140
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIImp.h" />
42-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIOS.h" />
43-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPITypes-Private.h" />
4441
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPITypes.h" />
4542
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\Logging.h" />
4643
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAProfiler.h" />

‎Build/VS2015/GPUPerfAPI-Common.vcxproj.filters

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,9 @@
4646
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPASessionRequests.h">
4747
<Filter>Source Files</Filter>
4848
</ClInclude>
49-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPI-Private.h">
50-
<Filter>Source Files</Filter>
51-
</ClInclude>
52-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIFunctionTypes-Private.h">
53-
<Filter>Source Files</Filter>
54-
</ClInclude>
5549
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIImp.h">
5650
<Filter>Source Files</Filter>
5751
</ClInclude>
58-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPIOS.h">
59-
<Filter>Source Files</Filter>
60-
</ClInclude>
61-
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPUPerfAPITypes-Private.h">
62-
<Filter>Source Files</Filter>
63-
</ClInclude>
6452
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\Logging.h">
6553
<Filter>Source Files</Filter>
6654
</ClInclude>
@@ -97,6 +85,9 @@
9785
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\DXGetAMDDeviceInfo.h">
9886
<Filter>Source Files</Filter>
9987
</ClInclude>
88+
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAInterfaceLoader.h">
89+
<Filter>Public Headers</Filter>
90+
</ClInclude>
10091
</ItemGroup>
10192
<ItemGroup>
10293
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPAContextState.cpp">
@@ -129,9 +120,6 @@
129120
<ClCompile Include="..\..\..\Common\Src\AMDTMutex\AMDTMutex.cpp">
130121
<Filter>CommonSrc</Filter>
131122
</ClCompile>
132-
<ClCompile Include="..\..\..\Common\Src\DeviceInfo-Internal\DeviceInfoInternal.cpp">
133-
<Filter>CommonSrc</Filter>
134-
</ClCompile>
135123
<ClCompile Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoUtils.cpp">
136124
<Filter>CommonSrc</Filter>
137125
</ClCompile>
@@ -144,5 +132,6 @@
144132
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPACustomHWValidationManager.cpp">
145133
<Filter>Source Files</Filter>
146134
</ClCompile>
135+
<ClCompile Include="..\..\..\Common\Src\DeviceInfo-Internal\DeviceInfoInternal.cpp" />
147136
</ItemGroup>
148137
</Project>

0 commit comments

Comments
 (0)