Skip to content

Commit 540c7e7

Browse files
author
Rys Sommefeldt
committed
Update AGS introductory sample for AGS 5.1
1 parent bdd091d commit 540c7e7

File tree

7 files changed

+192
-15
lines changed

7 files changed

+192
-15
lines changed

‎ags_sample/build/AGSSample_2013.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
</ImportGroup>
3737
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
3838
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39-
<Import Project="Windows10SDKVS13_x64.props" Condition="exists('$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um\Windows.h')" />
39+
<Import Project="Windows10SDKVS13_x64.props" Condition="exists('$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\um\Windows.h')" />
4040
</ImportGroup>
4141
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
4242
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
43-
<Import Project="Windows10SDKVS13_x64.props" Condition="exists('$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um\Windows.h')" />
43+
<Import Project="Windows10SDKVS13_x64.props" Condition="exists('$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\um\Windows.h')" />
4444
</ImportGroup>
4545
<PropertyGroup Label="UserMacros" />
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎ags_sample/build/AGSSample_2015.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Keyword>Win32Proj</Keyword>
1717
<RootNamespace>AGSSample</RootNamespace>
1818
<ProjectName>AGSSample</ProjectName>
19-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
19+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
2020
</PropertyGroup>
2121
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -63,7 +63,7 @@
6363
<TreatWarningAsError>true</TreatWarningAsError>
6464
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6565
<AdditionalIncludeDirectories>..\..\ags_lib\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
66-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
66+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
6767
<Optimization>Disabled</Optimization>
6868
<FloatingPointModel>Fast</FloatingPointModel>
6969
</ClCompile>

‎ags_sample/build/AGSSample_2017.sln‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AGSSample", "AGSSample_2017.vcxproj", "{021ECEC9-6E88-8240-B7C6-33E623706095}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|x64 = Debug|x64
9+
Release|x64 = Release|x64
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
{021ECEC9-6E88-8240-B7C6-33E623706095}.Debug|x64.ActiveCfg = Debug|x64
13+
{021ECEC9-6E88-8240-B7C6-33E623706095}.Debug|x64.Build.0 = Debug|x64
14+
{021ECEC9-6E88-8240-B7C6-33E623706095}.Release|x64.ActiveCfg = Release|x64
15+
{021ECEC9-6E88-8240-B7C6-33E623706095}.Release|x64.Build.0 = Release|x64
16+
EndGlobalSection
17+
GlobalSection(SolutionProperties) = preSolution
18+
HideSolutionNode = FALSE
19+
EndGlobalSection
20+
EndGlobal

‎ags_sample/build/AGSSample_2017.vcxproj‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|x64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|x64">
9+
<Configuration>Release</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{021ECEC9-6E88-8240-B7C6-33E623706095}</ProjectGuid>
15+
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
16+
<Keyword>Win32Proj</Keyword>
17+
<RootNamespace>AGSSample</RootNamespace>
18+
<ProjectName>AGSSample</ProjectName>
19+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
20+
</PropertyGroup>
21+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
23+
<ConfigurationType>Application</ConfigurationType>
24+
<UseDebugLibraries>true</UseDebugLibraries>
25+
<CharacterSet>Unicode</CharacterSet>
26+
<PlatformToolset>v141</PlatformToolset>
27+
</PropertyGroup>
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
29+
<ConfigurationType>Application</ConfigurationType>
30+
<UseDebugLibraries>false</UseDebugLibraries>
31+
<CharacterSet>Unicode</CharacterSet>
32+
<PlatformToolset>v141</PlatformToolset>
33+
<WholeProgramOptimization>true</WholeProgramOptimization>
34+
</PropertyGroup>
35+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
36+
<ImportGroup Label="ExtensionSettings">
37+
</ImportGroup>
38+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
39+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
40+
</ImportGroup>
41+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
42+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
43+
</ImportGroup>
44+
<PropertyGroup Label="UserMacros" />
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
46+
<LinkIncremental>true</LinkIncremental>
47+
<OutDir>..\bin\</OutDir>
48+
<IntDir>Desktop_2017\x64\Debug\</IntDir>
49+
<TargetName>AGSSample_Debug_2017</TargetName>
50+
<TargetExt>.exe</TargetExt>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
53+
<LinkIncremental>false</LinkIncremental>
54+
<OutDir>..\bin\</OutDir>
55+
<IntDir>Desktop_2017\x64\Release\</IntDir>
56+
<TargetName>AGSSample_Release_2017</TargetName>
57+
<TargetExt>.exe</TargetExt>
58+
</PropertyGroup>
59+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
60+
<ClCompile>
61+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
62+
<WarningLevel>Level4</WarningLevel>
63+
<TreatWarningAsError>true</TreatWarningAsError>
64+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
65+
<AdditionalIncludeDirectories>..\..\ags_lib\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
66+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
67+
<Optimization>Disabled</Optimization>
68+
<FloatingPointModel>Fast</FloatingPointModel>
69+
</ClCompile>
70+
<Link>
71+
<SubSystem>Console</SubSystem>
72+
<GenerateDebugInformation>true</GenerateDebugInformation>
73+
<AdditionalDependencies>amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
74+
<AdditionalLibraryDirectories>..\..\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
75+
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
76+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
77+
</Link>
78+
<PostBuildEvent>
79+
<Command>if not exist "..\bin\d3dcompiler_47.dll" if exist "$(ProgramFiles)\Windows Kits\8.1\Redist\D3D\x64\d3dcompiler_47.dll" xcopy "$(ProgramFiles)\Windows Kits\8.1\Redist\D3D\x64\d3dcompiler_47.dll" "..\bin" /H /R /Y &gt; nul
80+
xcopy "..\..\ags_lib\lib\amd_ags_x64.dll" "..\bin" /H /R /Y &gt; nul</Command>
81+
<Message>Copying dependencies...</Message>
82+
</PostBuildEvent>
83+
</ItemDefinitionGroup>
84+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
85+
<ClCompile>
86+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
87+
<WarningLevel>Level4</WarningLevel>
88+
<TreatWarningAsError>true</TreatWarningAsError>
89+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
90+
<AdditionalIncludeDirectories>..\..\ags_lib\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
91+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
92+
<Optimization>Full</Optimization>
93+
<FunctionLevelLinking>true</FunctionLevelLinking>
94+
<IntrinsicFunctions>true</IntrinsicFunctions>
95+
<MinimalRebuild>false</MinimalRebuild>
96+
<StringPooling>true</StringPooling>
97+
<FloatingPointModel>Fast</FloatingPointModel>
98+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
99+
</ClCompile>
100+
<Link>
101+
<SubSystem>Console</SubSystem>
102+
<GenerateDebugInformation>true</GenerateDebugInformation>
103+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
104+
<OptimizeReferences>true</OptimizeReferences>
105+
<AdditionalDependencies>amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
106+
<AdditionalLibraryDirectories>..\..\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
107+
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
108+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
109+
</Link>
110+
<PostBuildEvent>
111+
<Command>if not exist "..\bin\d3dcompiler_47.dll" if exist "$(ProgramFiles)\Windows Kits\8.1\Redist\D3D\x64\d3dcompiler_47.dll" xcopy "$(ProgramFiles)\Windows Kits\8.1\Redist\D3D\x64\d3dcompiler_47.dll" "..\bin" /H /R /Y &gt; nul
112+
xcopy "..\..\ags_lib\lib\amd_ags_x64.dll" "..\bin" /H /R /Y &gt; nul</Command>
113+
<Message>Copying dependencies...</Message>
114+
</PostBuildEvent>
115+
</ItemDefinitionGroup>
116+
<ItemGroup>
117+
<ClInclude Include="..\..\ags_lib\inc\amd_ags.h" />
118+
</ItemGroup>
119+
<ItemGroup>
120+
<ClCompile Include="..\src\AGSSample.cpp" />
121+
</ItemGroup>
122+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
123+
<ImportGroup Label="ExtensionTargets">
124+
</ImportGroup>
125+
</Project>

‎ags_sample/build/AGSSample_2017.vcxproj.filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="ags_lib">
5+
<UniqueIdentifier>{96EE2A27-02CE-A9C2-0BE6-349977441024}</UniqueIdentifier>
6+
</Filter>
7+
<Filter Include="ags_lib\inc">
8+
<UniqueIdentifier>{9FDCA789-0B92-207F-9486-1A56003B1783}</UniqueIdentifier>
9+
</Filter>
10+
<Filter Include="src">
11+
<UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>
12+
</Filter>
13+
</ItemGroup>
14+
<ItemGroup>
15+
<ClInclude Include="..\..\ags_lib\inc\amd_ags.h">
16+
<Filter>ags_lib\inc</Filter>
17+
</ClInclude>
18+
</ItemGroup>
19+
<ItemGroup>
20+
<ClCompile Include="..\src\AGSSample.cpp">
21+
<Filter>src</Filter>
22+
</ClCompile>
23+
</ItemGroup>
24+
</Project>

‎ags_sample/build/Windows10SDKVS13_x64.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<PropertyGroup Label="UserMacros" />
55
<PropertyGroup>
66
<ExecutablePath>$(ProgramFiles)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
7-
<IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\winrt;$(IncludePath)</IncludePath>
8-
<LibraryPath>$(ProgramFiles)\Windows Kits\10\lib\10.0.10240.0\um\x64;$(LibraryPath)</LibraryPath>
9-
<ExcludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\winrt;$(ExcludePath)</ExcludePath>
7+
<IncludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\winrt;$(IncludePath)</IncludePath>
8+
<LibraryPath>$(ProgramFiles)\Windows Kits\10\lib\10.0.15063.0\um\x64;$(LibraryPath)</LibraryPath>
9+
<ExcludePath>$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.15063.0\winrt;$(ExcludePath)</ExcludePath>
1010
</PropertyGroup>
1111
<ItemDefinitionGroup />
1212
</Project>

‎ags_sample/src/AGSSample.cpp‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,16 @@ void PrintDisplayInfo( const AGSGPUInfo& gpuInfo )
5858
printf( "Device id: 0x%04X\n", device.deviceId );
5959
printf( "Revision id: 0x%04X\n\n", device.revisionId );
6060

61+
const char* architecture[] =
62+
{
63+
"unknown",
64+
"pre-GCN",
65+
"GCN"
66+
};
67+
6168
if ( device.vendorId == 0x1002 )
6269
{
63-
printf( "Is %sGCN, %d CUs, core clock %d MHz, memory clock %d MHz, %.1f Tflops\n", device.architectureVersion == AGSDeviceInfo::ArchitectureVersion_GCN ? "" : "not ", device.numCUs, device.coreClock, device.memoryClock, device.teraFlops );
70+
printf( "Architecture: %s, %d CUs, core clock %d MHz, memory clock %d MHz, %.1f Tflops\n", architecture[ device.architectureVersion ], device.numCUs, device.coreClock, device.memoryClock, device.teraFlops );
6471
printf( "local memory: %d MBs\n\n", (int)( device.localMemoryInBytes / ( 1024 * 1024 ) ) );
6572
}
6673

@@ -69,12 +76,7 @@ void PrintDisplayInfo( const AGSGPUInfo& gpuInfo )
6976
if ( device.eyefinityEnabled )
7077
{
7178
printf( "SLS grid is %d displays wide by %d displays tall\n", device.eyefinityGridWidth, device.eyefinityGridHeight );
72-
printf( "SLS resolution is %d x %d pixels\n", device.eyefinityResolutionX, device.eyefinityResolutionY );
73-
74-
if ( device.eyefinityBezelCompensated )
75-
{
76-
printf( " SLS is bezel-compensated\n" );
77-
}
79+
printf( "SLS resolution is %d x %d pixels%s\n", device.eyefinityResolutionX, device.eyefinityResolutionY, device.eyefinityBezelCompensated ? ", bezel-compensated" : "" );
7880
}
7981
else
8082
{
@@ -112,13 +114,19 @@ void PrintDisplayInfo( const AGSGPUInfo& gpuInfo )
112114
if ( display.displayFlags & AGS_DISPLAYFLAG_DOLBYVISION )
113115
printf( "\tDolby Vision supported\n" );
114116

117+
if ( display.displayFlags & AGS_DISPLAYFLAG_FREESYNC )
118+
printf( "\tFreesync supported\n" );
119+
120+
if ( display.displayFlags & AGS_DISPLAYFLAG_FREESYNC_2 )
121+
printf( "\tFreesync 2 supported\n" );
122+
115123
printf( "\n" );
116124

117125
if ( display.displayFlags & AGS_DISPLAYFLAG_EYEFINITY_IN_GROUP )
118126
{
119127
printf( "\tEyefinity Display [%s mode] %s\n", display.displayFlags & AGS_DISPLAYFLAG_EYEFINITY_IN_PORTRAIT_MODE ? "portrait" : "landscape", display.displayFlags & AGS_DISPLAYFLAG_EYEFINITY_PREFERRED_DISPLAY ? " (preferred display)" : "" );
120128

121-
printf( "\tGrid coord %d x %d\n", display.eyefinityGridCoordX, display.eyefinityGridCoordY );
129+
printf( "\tGrid coord [%d, %d]\n", display.eyefinityGridCoordX, display.eyefinityGridCoordY );
122130
}
123131

124132
printf( "\tlogical display index: %d\n", display.logicalDisplayIndex );

0 commit comments

Comments
 (0)