Fixup AGS library linking and install

CMakeLists.txt

@@ -199,18 +199,23 @@ if(MSVC)
         if (${GFXRECON_AGS_SUPPORT})
             if (CMAKE_SIZEOF_VOID_P EQUAL 8)
                 find_package(AGS)
-                if (TARGET AGS::AGS)
+                if (AGS_FOUND)
                     add_definitions(-DGFXRECON_AGS_SUPPORT)
 
                     # The value for option GFXRECON_AGS_SUPPORT gets cached so use a non-cached variable
                     # to determine the final result.
                     set(GFXRECON_AGS_SUPPORT_FINAL ON)
+                else()
+                    message(WARNING "GFXRECON_AGS_SUPPORT was requested but the required dependencies were not found. "
+                            "AGS support will be disabled.")
                 endif() # TARGET AGS::AGS
+            else()
+                message(WARNING "GFXRECON_AGS_SUPPORT was requested but is not supported. An x64 build is required. "
+                        "AGS support will be disabled.")
             endif() # CMAKE_SIZEOF_VOID_P EQUAL 8
         endif() # GFXRECON_AGS_SUPPORT
     endif() # D3D12_SUPPORT
 
-
 else(MSVC)
     # Turn off D3D12 support for non MSVC builds.
     set(D3D12_SUPPORT OFF)

USAGE_desktop_D3D12.md

@@ -558,7 +558,7 @@ Steps:
 
 ### How to Process AGS Files
 
-Both gfxrecon-replay and gfxrecon-optimize are able to read and process capture files that contain with AGS calls. From a user point of view, their usage remains unchanged. The only additional requirement is that the official AGS DLL must live in the same directory as gfxrecon-replay and gfxrecon-optimize. This is because both tools need to find and reference the official AGS DLL in order to issue AGS calls.
+Both gfxrecon-replay and gfxrecon-optimize are able to read and process capture files that contain AGS calls. From a user point of view, their usage remains unchanged.
 
 
 

cmake/FindAGS.cmake

@@ -5,95 +5,69 @@
 #
 # This module is derived from the CMake FindZLIB.cmake module.
 #
-# IMPORTED Targets
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines :prop_tgt:`IMPORTED` target ``AGS::AGS``, if AGS has been found.
-#
 # Result Variables
 # ^^^^^^^^^^^^^^^^
 #
 # This module defines the following variables:
 #
-#  AGS_FOUND        : True if AGS was found.
-#  AGS_INCLUDE_DIRS : The locatio of the AGS header files.
-#  AGS_LIBRARIES    : List of the AGS libraries.
-#
-# Hints
-# ^^^^^
-#
-# The ``AGS_ROOT`` value may be set to tell this module where to look.
-
-set(_AGS_SEARCH_PATH)
-
-if (AGS_ROOT)
-    set(_AGS_SEARCH_ROOT PATHS ${AGS_ROOT} NO_DEFAULT_PATH)
-    list(APPEND _AGS_SEARCH_PATH _AGS_SEARCH_ROOT)
+#  AGS_FOUND           : True if AGS was found.
+#  AGS_INCLUDE_DIR     : The location of the AGS header file.
+#  AGS_LIBRARY_RELEASE : Location of the AGS library for release builds.
+#  AGS_LIBRARY_DEBUG   : Location of the AGS library for debug builds.
+
+# Find the build architecture.
+set(AGS_ARCH "")
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(AGS_ARCH "x64")
+else()
+    message(WARNING "AGS support requires an x64 build.")
 endif()
 
-# Normal search.
-set(_AGS_x86 "(x86)")
-set(_AGS_SEARCH_NORMAL
-    PATHS "$ENV{ProgramFiles}/ags"
-          "$ENV{ProgramFiles${_AGS_x86}}/ags")
-unset(_AGS_x86)
-list(APPEND _AGS_SEARCH_PATH _AGS_SEARCH_NORMAL)
-
-set(AGS_NAMES ags)
-set(AGS_NAMES_DEBUG agsd)
-
-foreach(search ${_AGS_SEARCH_PATH})
-    find_path(AGS_INCLUDE_DIR NAMES amd_ags.h ${${search}} PATH_SUFFIXES include)
-endforeach()
-
-# Allow AGS_LIBRARY to be set manually, as the location of the AGS library
-if(NOT AGS_LIBRARY)
-    foreach(search ${_AGS_SEARCH_PATH})
-        find_library(AGS_LIBRARY_RELEASE NAMES ${AGS_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
-        find_library(AGS_LIBRARY_DEBUG NAMES ${AGS_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
-    endforeach()
-
-    include(SelectLibraryConfigurations)
-    select_library_configurations(AGS)
+# Find the MSVC version.
+set(AGS_MSVC_TOOLSET "")
+if(${MSVC_TOOLSET_VERSION} EQUAL 141)
+    set(AGS_MSVC_TOOLSET "2017")
+elseif(${MSVC_TOOLSET_VERSION} EQUAL 142)
+    set(AGS_MSVC_TOOLSET "2019")
+elseif(${MSVC_TOOLSET_VERSION} EQUAL 143)
+    set(AGS_MSVC_TOOLSET "2022")
+else()
+    message(WARNING "AGS support requires MSVC version 2015, 2017, 2019, or 2022.")
 endif()
 
-unset(AGS_NAMES)
-unset(AGS_NAMES_DEBUG)
+# If CMAKE_MSVC_RUNTIME_LIBRARY is set, use that to determine MSVC runtime. Otherwise default to /MD.
+set(AGS_MSVC_RUNTIME "MD")
+if(CMAKE_MSVC_RUNTIME_LIBRARY AND
+    (("${CMAKE_MSVC_RUNTIME_LIBRARY}" STREQUAL "MultiThreaded") OR
+     ("${CMAKE_MSVC_RUNTIME_LIBRARY}" STREQUAL "MultiThreadedDebug")))
+    set(AGS_MSVC_RUNTIME "MT")
+endif()
 
-mark_as_advanced(AGS_INCLUDE_DIR)
+if(AGS_ARCH AND AGS_MSVC_TOOLSET AND AGS_MSVC_RUNTIME)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(AGS REQUIRED_VARS AGS_LIBRARY AGS_INCLUDE_DIR)
+    set(AGS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/external/AGS_SDK/ags_lib")
 
-if(AGS_FOUND)
-    set(AGS_INCLUDE_DIRS ${AGS_INCLUDE_DIR})
+    find_path(AGS_INCLUDE_DIR NAMES amd_ags.h PATHS ${AGS_SEARCH_PATH} PATH_SUFFIXES inc)
+    mark_as_advanced(AGS_INCLUDE_DIR)
 
-    if(NOT AGS_LIBRARIES)
-        set(AGS_LIBRARIES ${AGS_LIBRARY})
+    set(AGS_LIBRARY_NAME "amd_ags_${AGS_ARCH}_${AGS_MSVC_TOOLSET}_${AGS_MSVC_RUNTIME}")
+
+    # If cached library strings don't match, unset variables.
+    if(AGS_LIBRARY_RELEASE AND NOT ${AGS_LIBRARY_RELEASE} MATCHES "${AGS_LIBRARY_NAME}")
+        message("Current AGS_LIBRARY_RELEASE '${AGS_LIBRARY_RELEASE}' does not match required library name "
+                "'${AGS_LIBRARY_NAME}'. Resetting AGS_LIBRARY_RELEASE.")
+        unset(AGS_LIBRARY_RELEASE CACHE)
     endif()
-
-    if(NOT TARGET AGS::AGS)
-        add_library(AGS::AGS UNKNOWN IMPORTED)
-        set_target_properties(AGS::AGS PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${AGS_INCLUDE_DIRS}")
-
-        if(AGS_LIBRARY_RELEASE)
-            set_property(TARGET AGS::AGS APPEND PROPERTY
-                IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(AGS::AGS PROPERTIES
-                IMPORTED_LOCATION_RELEASE "${AGS_LIBRARY_RELEASE}")
-        endif()
-
-        if(AGS_LIBRARY_DEBUG)
-            set_property(TARGET AGS::AGS APPEND PROPERTY
-                IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(AGS::AGS PROPERTIES
-                IMPORTED_LOCATION_DEBUG "${AGS_LIBRARY_DEBUG}")
-        endif()
-
-        if(NOT AGS_LIBRARY_RELEASE AND NOT AGS_LIBRARY_DEBUG)
-            set_property(TARGET AGS::AGS APPEND PROPERTY
-                IMPORTED_LOCATION "${AGS_LIBRARY}")
-        endif()
+    if(AGS_LIBRARY_DEBUG AND NOT ${AGS_LIBRARY_DEBUG} MATCHES "${AGS_LIBRARY_NAME}d")
+        message("Current AGS_LIBRARY_DEBUG '${AGS_LIBRARY_DEBUG}' does not match required library name "
+                "'${AGS_LIBRARY_NAME}d'. Resetting AGS_LIBRARY_DEBUG.")
+        unset(AGS_LIBRARY_DEBUG CACHE)
     endif()
+
+    find_library(AGS_LIBRARY_RELEASE NAMES ${AGS_LIBRARY_NAME} PATHS ${AGS_SEARCH_PATH} PATH_SUFFIXES lib)
+    find_library(AGS_LIBRARY_DEBUG NAMES "${AGS_LIBRARY_NAME}d" PATHS ${AGS_SEARCH_PATH} PATH_SUFFIXES lib)
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(AGS REQUIRED_VARS AGS_LIBRARY_RELEASE AGS_LIBRARY_DEBUG AGS_INCLUDE_DIR)
+
 endif()

external/AGS_SDK/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

external/AGS_SDK/README.md

@@ -0,0 +1,136 @@
+# AMD AGS SDK
+![AMD AGS SDK](http://gpuopen-librariesandsdks.github.io/media/amd_logo_black.png)
+
+The AMD GPU Services (AGS) library provides software developers with the ability to query AMD GPU software and hardware state information that is not normally available through standard operating systems or graphics APIs.  If you are serious about getting the most from your AMD GPU, then AGS can help you harness that power.
+
+AGS includes support for querying graphics driver version info, GPU hardware info, performance metrics, shader extensions and additional extensions supported in the AMD drivers for DirectX 11 and DirectX 12.  AGS also provides Crossfire™ (AMD's multi-GPU rendering technology) support and Eyefinity (AMD's multi-display rendering technology) configuration info.
+
+In addition to the library itself, the AGS SDK includes several samples to demonstrate use of the library.
+
+<div>
+  <a href="https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/releases/latest/"><img src="http://gpuopen-librariesandsdks.github.io/media/latest-release-button.svg" alt="Latest release" title="Latest release"></a>
+</div>
+
+### What's new in AGS 6.2
+Version 6.2 includes support for the shader clock intriniscs.
+
+Distribution of VS2015 binaries has been removed.
+
+### What's new in AGS 6.1
+Version 6.1 includes RDNA3 GPU detection.
+
+The DLL version of AGS now statically links against the runtime library, and there are now versions of the static library built with the VS 2022 toolchain.
+
+There is also a DX12 extensions sample to demonstrate how to use the extensions mechanism.
+
+### What's new in AGS 6.0.1
+Version 6.0.1 is a bugfix release that corrects symbols for some of the DX11 shader intrinsics, and removes a rogue non-ASCII character from a comment in the library header which could cause a warning with Visual Studio.
+
+### What's new in AGS 6.0
+Version 6.0 introduces several new shader intrinsics, namely a DX12 ray tracing hit token for RDNA2 hardware for ray tracing optimisation, ReadLaneAt and explicit float conversions.  There is also a change to the initialization API to make sure the AGS dll matches the header and calling code.
+
+### What's new in AGS 5.4.2
+Version 5.4.2 reinstates the sharedMemoryInBytes field which is required when calculating the memory available on APUs.
+
+### What's new in AGS 5.4.1
+Version 5.4.1 includes x86 libs and Visual Studio 2019 support.  There is also support for base vertex and base instance intrinsics as well as GetWaveSize intrinsics.  The samples have been ported from premake to cmake.
+
+### What's new in AGS 5.4
+Version 5.4 adds a better description of the GPU architecture for those wishing to fine tune their games for specific code paths.  In addition, there are now shader intrinsics for getting the draw index for execute indirect calls as well as support for atomic U64 ops.
+
+Radeon 7 and RDNA GPU core and memory speeds are now returned.
+
+### What's new in AGS 5.3
+Version 5.3 adds DirectX 11 deferred context support for our MultiDrawIndirect and UAV overlap extensions, along with a helper function to let your app determine if the installed driver meets your game's minimum driver version requirements. If you're a Vulkan user, you can pair that with our machine readable AMD Vulkan versions database, to get more information about the Vulkan implementation in our client driver.
+
+Lastly, there's a new FreeSync 2 gamma 2.2 mode. It uses a 10-bit (per RGB component, 2-bit alpha) swapchain, as opposed to the 16-bit (per RGB component, 16-bit alpha) swapchain needed for FreeSync 2 scRGB.
+
+### What's new in AGS 5.2
+Version 5.2 adds support for app registration in DirectX 12. App registration lets you give more information about your game or application to our driver, which can then use that (ideally unique) information to better support the game or app if we need to make driver-side changes to help things run as efficiently and correctly as possible.
+
+We also changed how you get access to extensions under DX12, requiring you to create your GPU device using `agsDriverExtensionsDX12_CreateDevice()` , instead of the normal `D3D12CreateDevice()` call you’d make to D3D.
+
+Lastly, we’ve also added support for breadcrumb markers in D3D11. Using the `agsDriverExtensionsDX11_WriteBreadcrumb()` API, you can put in place a strategy for debugging driver issues more easily. Sometimes your game or app can interact with the driver in a way that causes it to crash or TDR. The new API gives you the ability to leave markers around your D3D11 API calls, helping you narrow down exactly what interaction with the driver caused the problem.
+
+### What's new in AGS 5.1
+Version 5.1 is a partly developer-focused update to AGS 5. We've listened to feedback about how difficult it can be to integrate the binary AGS libs into your games, and while we can't open the source code to AGS to allow you to integrate it from source, we canvassed developers to figure out what pre-built binaries would be most useful to provide. So we've now added builds of the AGS binary library that are linkable with Visual Studio projects built with `/MT` and `/MD`, used to select a particular CRT.
+
+There's also a breaking change in how you get access to DX11 AMD extensions. Look at the Changelog for details on that. We've also added an application registration extension for DX11 apps. That lets you tell the driver that your game can be considered in a uniquely indentifiable way, which is particularly helpful if you build on top of popular middleware like Unity or UE4 and make rendering changes.
+
+There's also support for FreeSync 2 HDR, DX12 application user markers for [Radeon GPU Profiler](https://gpuopen.com/gaming-product/radeon-gpu-profiler-rgp/), VS2017 versions of the shipping samples, and new wave-level shader intrinsics for both DX11 and DX12.
+
+See the full Changelog for more details.
+
+### What's new in AGS 5.0
+Version 5.0 is a major overhaul of the library designed to provide a much clearer view of the GPUs in the system and the displays attached to them. It also exposes the ability to query each display for HDR capabilities and put those HDR-capable displays into various HDR modes.
+
+Highlights include the following:
+* Full GPU enumeration with adapter string, device id, revision id and vendor id.
+* Per-GPU display enumeration including information on display name, resolution, and HDR capabilities.
+* Optional user-supplied memory allocator.
+* Function to set displays into HDR mode.<sup>[1](#ags-sdk-footnote1)</sup>
+* A Microsoft WACK compliant version of the library.
+* DirectX 11 shader compiler controls.<sup>[1](#ags-sdk-footnote1)</sup>
+* DirectX 11 multiview extension.<sup>[2](#ags-sdk-footnote1)</sup>
+* DirectX 11 Crossfire API updates.
+  * Now supports using the API without needing a driver profile.
+  * You can also now specify the transfer engine.
+
+### Driver extensions
+AGS exposes GCN shader extensions for both DirectX 11 and DirectX 12. It also provides access to additional extensions available in the AMD driver for DirectX 11:
+  * Quad List primitive type
+  * UAV overlap
+  * Depth bounds test
+  * Multi-draw indirect
+  * Multiview
+
+### Prerequisites
+* AMD Radeon&trade; GCN-based GPU (HD 7000 series or newer)
+  * Or other DirectX&reg; 11 compatible GPU with Shader Model 5 support<sup>[3](#ags-sdk-footnote1)</sup> 
+* 64-bit Windows&reg; 7 (SP1 with the [Platform Update](https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687.aspx)), Windows&reg; 8.1, or Windows&reg; 10
+* Visual Studio&reg; 2013 or Visual Studio&reg; 2015
+* Recommended driver: Radeon Software Crimson ReLive Edition 16.12.1 (driver version 16.50.2001) or later 
+
+### Getting Started
+* It is recommended to take a look at the sample source code.
+  * There are three samples: ags_sample, crossfire_sample, and eyefinity_sample.
+* Visual Studio projects for VS2013 and VS2015 can be found in each sample's `build` directory.
+* Additional documentation, including API documentation and instructions on how to add AGS support to an existing project, can be found in the `ags_lib\doc` directory.
+  * There is also [online documentation](http://gpuopen-librariesandsdks.github.io/ags/). 
+
+### Additional Samples
+In addition to the three samples included in this repo, there are other samples available on GitHub that use AGS:
+* [CrossfireAPI11](https://github.com/GPUOpen-LibrariesAndSDKs/CrossfireAPI11) - a larger example of using the explicit Crossfire API
+  * The CrossfireAPI11 sample also comes with an extensive guide for multi-GPU: the *AMD Crossfire guide for Direct3D&reg; 11 applications*
+* [DepthBoundsTest11](https://github.com/GPUOpen-LibrariesAndSDKs/DepthBoundsTest11) - a sample showing how to use the depth bounds test extension
+* [Barycentrics11](https://github.com/GPUOpen-LibrariesAndSDKs/Barycentrics11) - a sample showing how to use the GCN shader extensions for DirectX 11
+* [Barycentrics12](https://github.com/GPUOpen-LibrariesAndSDKs/Barycentrics12) - a sample showing how to use the GCN shader extensions for DirectX 12
+
+### Premake
+The Visual Studio projects in each sample's `build` directory were generated with Premake. To generate the project files yourself, open a command prompt in the sample's `premake` directory (where the premake5.lua script for that sample is located, not the top-level directory where the premake5 executable is located) and execute the following command:
+
+* `..\..\premake\premake5.exe [action]`
+* For example: `..\..\premake\premake5.exe vs2015`
+
+Alternatively, to regenerate all Visual Studio files for the SDK, execute `ags_update_vs_files.bat` in the top-level `premake` directory.
+
+This version of Premake has been modified from the stock version to use the property sheet technique for the Windows SDK from this [Visual C++ Team blog post](http://blogs.msdn.com/b/vcblog/archive/2012/11/23/using-the-windows-8-sdk-with-visual-studio-2010-configuring-multiple-projects.aspx). The technique was originally described for using the Windows 8.0 SDK with Visual Studio 2010, but it applies more generally to using newer versions of the Windows SDK with older versions of Visual Studio.
+
+By default, Visual Studio 2013 projects will compile against the Windows 8.1 SDK. However, the VS2013 projects generated with this version of Premake will use the next higher SDK (i.e. the Windows 10 SDK), if the newer SDK exists on the user's machine.
+
+For Visual Studio 2015, the systemversion Premake function is used to add the `WindowsTargetPlatformVersion` element to the project file, to specify which version of the Windows SDK will be used. To change `WindowsTargetPlatformVersion` for Visual Studio 2015, change the value for `_AMD_WIN_SDK_VERSION` in `premake\amd_premake_util.lua` and regenerate the Visual Studio files.
+
+### Third-Party Software
+* DXUT is distributed under the terms of the MIT License. See `eyefinity_sample\dxut\MIT.txt`.
+* Premake is distributed under the terms of the BSD License. See `premake\LICENSE.txt`.
+
+### Attribution
+* AMD, the AMD Arrow logo, Radeon, Crossfire, and combinations thereof are either registered trademarks or trademarks of Advanced Micro Devices, Inc. in the United States and/or other countries.
+* Microsoft, DirectX, Visual Studio, and Windows are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries.
+
+### Notes
+<a name="ags-sdk-footnote1">1</a>: Requires Radeon Software Crimson Edition 16.9.2 (driver version 16.40.2311) or later.
+
+<a name="ags-sdk-footnote1">2</a>: Requires Radeon Software Crimson ReLive Edition 16.12.1 (driver version 16.50.2001) or later.
+
+<a name="ags-sdk-footnote1">3</a>: While the AGS SDK samples will run on non-AMD hardware, they will be of limited usefulness, since the purpose of AGS is to provide convenient access to AMD-specific information and extensions.