Pull latest ags_lib to re-enable GCN shader extension support

This also adds support for Multidraw Indirect Count Indirect for DirectX
11 and fixes clock speed information for Polaris GPUs.

* Requires Radeon Software Crimson Edition 16.9.1 (driver version 16.40)
or later

Author: jstewart-amd

ags_lib/CHANGELOG.md

@@ -1,5 +1,11 @@
 # AMD AGS Library Changelog
 
+### v4.0.3 - 2016-08-18
+* Improve support for DirectX 11 and DirectX 12 GCN shader extensions
+* Add support for Multidraw Indirect Count Indirect for DirectX 11
+* Fix clock speed information for Polaris GPUs
+* Requires Radeon Software Crimson Edition 16.9.1 (driver version 16.40) or later
+
 ### v4.0.0 - 2016-05-24
 * Add support for GCN shader extensions
   * Shader extensions are exposed for both DirectX 11 and DirectX 12

ags_lib/README.md

@@ -1,7 +1,7 @@
 # AMD AGS Library
 ![AMD AGS Library](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 graphic APIs. Version 4.0 of the library includes support for querying graphics driver version info, GPU performance, Crossfire™ (AMD's multi-GPU rendering technology) configuration info, and Eyefinity (AMD's multi-display rendering technology) configuration info. AGS also exposes the explicit Crossfire API extension and additional extensions supported in the AMD drivers for DirectX 11.
+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 graphic APIs. Version 4.0 of the library includes support for querying graphics driver version info, GPU performance, Crossfire™ (AMD's multi-GPU rendering technology) configuration info, and Eyefinity (AMD's multi-display rendering technology) configuration info. AGS also exposes the explicit Crossfire API extension, GCN shader extensions, and additional extensions supported in the AMD drivers for DirectX 11 and DirectX 12.
 
 This version of the AGS library is just the documentation, header file, import libraries, and DLLs. For the full AGS SDK, which includes samples, visit the AGS SDK repository:
 https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK

ags_lib/doc/AGS Documentation.pdf

@@ -24,7 +24,7 @@
 
 #define AMD_AGS_VERSION_MAJOR 4
 #define AMD_AGS_VERSION_MINOR 0
-#define AMD_AGS_VERSION_PATCH 2
+#define AMD_AGS_VERSION_PATCH 3
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,14 +65,37 @@ enum AGSReturnCode
 
 enum AGSDriverExtensionDX11
 {
-    AGS_DX11_EXTENSION_QUADLIST                 = 1 << 0,
-    AGS_DX11_EXTENSION_SCREENRECTLIST           = 1 << 1,
-    AGS_DX11_EXTENSION_UAV_OVERLAP              = 1 << 2,
-    AGS_DX11_EXTENSION_DEPTH_BOUNDS_TEST        = 1 << 3,
-    AGS_DX11_EXTENSION_MULTIDRAWINDIRECT        = 1 << 4,
-    AGS_DX11_EXTENSION_CROSSFIRE_API            = 1 << 5,
+    AGS_DX11_EXTENSION_QUADLIST = 1 << 0,
+    AGS_DX11_EXTENSION_SCREENRECTLIST = 1 << 1,
+    AGS_DX11_EXTENSION_UAV_OVERLAP = 1 << 2,
+    AGS_DX11_EXTENSION_DEPTH_BOUNDS_TEST = 1 << 3,
+    AGS_DX11_EXTENSION_MULTIDRAWINDIRECT = 1 << 4,
+    AGS_DX11_EXTENSION_MULTIDRAWINDIRECT_COUNTINDIRECT = 1 << 5,
+    AGS_DX11_EXTENSION_CROSSFIRE_API = 1 << 6,
+    AGS_DX11_EXTENSION_INTRINSIC_READFIRSTLANE = 1 << 7,
+    AGS_DX11_EXTENSION_INTRINSIC_READLANE = 1 << 8,
+    AGS_DX11_EXTENSION_INTRINSIC_LANEID = 1 << 9,
+    AGS_DX11_EXTENSION_INTRINSIC_SWIZZLE = 1 << 10,
+    AGS_DX11_EXTENSION_INTRINSIC_BALLOT = 1 << 11,
+    AGS_DX11_EXTENSION_INTRINSIC_MBCOUNT = 1 << 12,
+    AGS_DX11_EXTENSION_INTRINSIC_COMPARE3 = 1 << 13,
+    AGS_DX11_EXTENSION_INTRINSIC_BARYCENTRICS = 1 << 14
 };
 
+enum AGSDriverExtensionDX12
+{
+    AGS_DX12_EXTENSION_INTRINSIC_READFIRSTLANE = 1 << 0,
+    AGS_DX12_EXTENSION_INTRINSIC_READLANE = 1 << 1,
+    AGS_DX12_EXTENSION_INTRINSIC_LANEID = 1 << 2,
+    AGS_DX12_EXTENSION_INTRINSIC_SWIZZLE = 1 << 3,
+    AGS_DX12_EXTENSION_INTRINSIC_BALLOT = 1 << 4,
+    AGS_DX12_EXTENSION_INTRINSIC_MBCOUNT = 1 << 5,
+    AGS_DX12_EXTENSION_INTRINSIC_COMPARE3 = 1 << 6,
+    AGS_DX12_EXTENSION_INTRINSIC_BARYCENTRICS = 1 << 7
+};
+
+const unsigned int AGS_DX12_SHADER_INSTRINSICS_SPACE_ID = 0x7FFF0ADE; // 2147420894
+
 enum AGSPrimitiveTopology
 {
     AGS_PRIMITIVE_TOPOLOGY_QUADLIST = 7,
@@ -284,15 +307,36 @@ AMD_AGS_API AGSReturnCode agsGetGPUMemorySize( AGSContext* context, int gpuIndex
 AMD_AGS_API AGSReturnCode agsGetEyefinityConfigInfo( AGSContext* context, int displayIndex, AGSEyefinityInfo* eyefinityInfo, int* numDisplaysInfo, AGSDisplayInfo* displaysInfo );
 
 
+// Description
+//   Function used to initialize the AMD-specific driver extensions for D3D12
+//
+// Input params
+//   context -             Pointer to a context. This is generated by agsInit()
+//   device -              The D3D12 device.
+//   extensionsSupported - Pointer to a bit mask that this function will fill in to indicate which extensions are supported.
+//
+AMD_AGS_API AGSReturnCode agsDriverExtensionsDX12_Init( AGSContext* context, ID3D12Device* device, unsigned int* extensionsSupported );
+
+// Description
+//   Function used to cleanup any AMD-specific driver extensions for D3D12
+//
+// Input params
+//   context -             Pointer to a context.
+//
+AMD_AGS_API AGSReturnCode agsDriverExtensionsDX12_DeInit( AGSContext* context );
+
+
 // Description
 //   Function used to initialize the AMD-specific driver extensions for D3D11
 //
 // Input params
 //   context -             Pointer to a context. This is generated by agsInit()
 //   device -              The D3D11 device.
+//   uavSlot -             The UAV slot reserved for intrinsic support. This must match the slot defined in the HLSL, ie #define AmdDxExtShaderIntrinsicsUAVSlot.
+//                         The default slot is 7, but the caller is free to use an alternative slot.
 //   extensionsSupported - Pointer to a bit mask that this function will fill in to indicate which extensions are supported.
 //
-AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_Init( AGSContext* context, ID3D11Device* device, unsigned int* extensionsSupported );
+AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_Init( AGSContext* context, ID3D11Device* device, unsigned int uavSlot, unsigned int* extensionsSupported );
 
 // Description
 //   Function used to cleanup any AMD-specific driver extensions for D3D11
@@ -345,18 +389,52 @@ AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_SetDepthBounds( AGSContext* co
 //   Function used to submit a batch of draws via MultiDrawIndirect
 //
 // Input params
-//   context -             Pointer to a context.
+//   context -                      Pointer to a context.
+//   drawCount -                    The number of draws.
+//   pBufferForArgs -               The args buffer.
+//   alignedByteOffsetForArgs -     The offset into the args buffer.
+//   byteStrideForArgs -            The per element stride of the args buffer.
 //
 AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_MultiDrawInstancedIndirect( AGSContext* context, unsigned int drawCount, ID3D11Buffer* pBufferForArgs, unsigned int alignedByteOffsetForArgs, unsigned int byteStrideForArgs );
 
 // Description
 //   Function used to submit a batch of draws via MultiDrawIndirect
 //
 // Input params
-//   context -             Pointer to a context.
+//   context -                      Pointer to a context.
+//   drawCount -                    The number of draws.
+//   pBufferForArgs -               The args buffer.
+//   alignedByteOffsetForArgs -     The offset into the args buffer.
+//   byteStrideForArgs -            The per element stride of the args buffer.
 //
 AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect( AGSContext* context, unsigned int drawCount, ID3D11Buffer* pBufferForArgs, unsigned int alignedByteOffsetForArgs, unsigned int byteStrideForArgs );
 
+// Description
+//   Function used to submit a batch of draws via MultiDrawIndirect
+//
+// Input params
+//   context -                          Pointer to a context.
+//   pBufferForDrawCount -              The draw count buffer.
+//   alignedByteOffsetForDrawCount -    The offset into the draw count buffer.
+//   pBufferForArgs -                   The args buffer.
+//   alignedByteOffsetForArgs -         The offset into the args buffer.
+//   byteStrideForArgs -                The per element stride of the args buffer.
+//
+AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect( AGSContext* context, ID3D11Buffer* pBufferForDrawCount, unsigned int alignedByteOffsetForDrawCount, ID3D11Buffer* pBufferForArgs, unsigned int alignedByteOffsetForArgs, unsigned int byteStrideForArgs );
+
+// Description
+//   Function used to submit a batch of draws via MultiDrawIndirect
+//
+// Input params
+//   context -                          Pointer to a context.
+//   pBufferForDrawCount -              The draw count buffer.
+//   alignedByteOffsetForDrawCount -    The offset into the draw count buffer.
+//   pBufferForArgs -                   The args buffer.
+//   alignedByteOffsetForArgs -         The offset into the args buffer.
+//   byteStrideForArgs -                The per element stride of the args buffer.
+//
+AMD_AGS_API AGSReturnCode agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect( AGSContext* context, ID3D11Buffer* pBufferForDrawCount, unsigned int alignedByteOffsetForDrawCount, ID3D11Buffer* pBufferForArgs, unsigned int alignedByteOffsetForArgs, unsigned int byteStrideForArgs );
+
 // Description
 //   Functions to create a Direct3D11 resource with the specified AFR transfer type
 //