Add ability to disable Crossfire

The desired Crossfire mode is now passed into agsInit. In addition to
the existing ability to enable the explicit Crossfire API, AGS now
supports the ability to disable Crossfire.

This update also includes some minor cleanup and updates to the samples.

Author: jstewart-amd

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 See `ags_lib\CHANGELOG.md` for changes to the core AGS library. 
 
+### v3.2.0 - 2016-02-12
+* Update ags_sample to use the library version number from the optional info parameter of `agsInit`
+* Update crossfire_sample to call `agsInit` prior to device creation
+* Update eyefinity_sample with latest DXUT
+
 ### v3.1.1 - 2016-01-28
 * Display library version number in ags_sample
 * Do not display `radeonSoftwareVersion` in ags_sample while we wait for a needed driver update

ags_sample/src/AGSSample.cpp

@@ -119,18 +119,17 @@ int main(int argc, char* argv[])
         displayIndex++;
     }
 
-    AGSGPUInfo info;
-
-    if ( agsInit( &agsContext, &info ) == AGS_SUCCESS )
+    AGSGPUInfo gpuInfo;
+    if ( agsInit( &agsContext, nullptr, &gpuInfo ) == AGS_SUCCESS )
     {
-        printf( "AGS Library initialized: v%d.%d.%d\n\n", AMD_AGS_LIB_VERSION_MAJOR, AMD_AGS_LIB_VERSION_MINOR, AMD_AGS_LIB_VERSION_PATCH );
+        printf( "AGS Library initialized: v%d.%d.%d\n\n", gpuInfo.agsVersionMajor, gpuInfo.agsVersionMinor, gpuInfo.agsVersionPatch );
         printf( "-----------------------------------------------------------------\n" );
 
-        printf( "%s, device id: 0x%04X, revision id: 0x%02X\n", info.adapterString ? info.adapterString : "unknown GPU", info.deviceId, info.revisionId );
-        printf( "Driver version:            %s\n", info.driverVersion );
+        printf( "%s, device id: 0x%04X, revision id: 0x%02X\n", gpuInfo.adapterString ? gpuInfo.adapterString : "unknown GPU", gpuInfo.deviceId, gpuInfo.revisionId );
+        printf( "Driver version:            %s\n", gpuInfo.driverVersion );
         printf( "-----------------------------------------------------------------\n" );
 
-        printf( "Is %sGCN, %d CUs, core clock %d MHz, memory clock %d MHz, %.1f Tflops\n", info.version == AGSGPUInfo::ArchitectureVersion_GCN ? "" : "not ", info.iNumCUs, info.iCoreClock, info.iMemoryClock, info.fTFlops );
+        printf( "Is %sGCN, %d CUs, core clock %d MHz, memory clock %d MHz, %.1f Tflops\n", gpuInfo.architectureVersion == AGSGPUInfo::ArchitectureVersion_GCN ? "" : "not ", gpuInfo.iNumCUs, gpuInfo.iCoreClock, gpuInfo.iMemoryClock, gpuInfo.fTFlops );
 
         int totalGPUs = 0;
         if ( agsGetTotalGPUCount( agsContext, &totalGPUs ) == AGS_SUCCESS )

crossfire_sample/src/CFXAPISample.cpp

@@ -202,16 +202,21 @@ void CFXAPISample::Present ()
 	swapChain_->Present (1, 0);
 }
 
-void CFXAPISample::InitializeAMDCFXAPI ()
+void CFXAPISample::InitializeAMDAGS()
 {
-	agsInit (&agsContext_, nullptr);
+	// the desired Crossfire mode needs to be passed to agsInit
+	// prior to device creation
+	AGSConfiguration config;
+	config.crossfireMode = AGS_CROSSFIRE_MODE_EXPLICIT_AFR;
+	agsInit (&agsContext_, &config, nullptr );
+}
 
+void CFXAPISample::InitializeAMDCFXAPI ()
+{
 	unsigned int supportedExtensions = 0;
 	agsDriverExtensions_Init (agsContext_, device_.Get (), &supportedExtensions);
 
 	if ((supportedExtensions & AGS_EXTENSION_CROSSFIRE_API) == AGS_EXTENSION_CROSSFIRE_API) {
-		agsDriverExtensions_SetCrossfireMode (agsContext_, AGS_CROSSFIRE_MODE_EXPLICIT_AFR);
-
 		cfxEnabled_ = true;
 	} else {
 		cfxEnabled_ = false;
@@ -223,6 +228,9 @@ void CFXAPISample::Initialize ()
 {
 	window_.reset (new Window ("AMD CFX API test", 1920, 1080));
 
+	// Call this before device creation
+	InitializeAMDAGS ();
+
 	CreateDeviceAndSwapChain ();
 
 	InitializeAMDCFXAPI ();
@@ -286,12 +294,13 @@ void CFXAPISample::Initialize ()
 void CFXAPISample::Shutdown ()
 {
 	agsDriverExtensions_DeInit (agsContext_);
-	agsDeInit (agsContext_);
 
 	// Clear things out to avoid false-positive D3D debug runtime ref-count warnings.
 	swapChain_->SetFullscreenState (FALSE, 0);
 	deviceContext_->ClearState ();
 	deviceContext_->Flush ();
+
+	agsDeInit (agsContext_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////

crossfire_sample/src/CFXAPISample.h

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 //
-#ifndef AMD_AGS_SDK_CFX_API_SAMPLE_MAIN_H_
-#define AMD_AGS_SDK_CFX_API_SAMPLE_MAIN_H_
+#ifndef AMD_AGS_CFX_API_SAMPLE_MAIN_H
+#define AMD_AGS_CFX_API_SAMPLE_MAIN_H
 
 #include <d3d11.h>
 #include <wrl.h>
@@ -74,6 +74,7 @@ class CFXAPISample
 	void Present ();
 	void CreateDeviceAndSwapChain ();
 	void CreateMeshBuffers ();
+	void InitializeAMDAGS ();
 	void InitializeAMDCFXAPI ();
 
 	std::unique_ptr<Window> window_;

crossfire_sample/src/Window.h

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 //
-#ifndef AMD_AGS_SDK_CFX_API_SAMPLE_WINDOW_H_
-#define AMD_AGS_SDK_CFX_API_SAMPLE_WINDOW_H_
+#ifndef AMD_AGS_CFX_API_SAMPLE_WINDOW_H
+#define AMD_AGS_CFX_API_SAMPLE_WINDOW_H
 
 #include <string>
 #include <Windows.h>

eyefinity_sample/dxut/Core/DDSTextureLoader.cpp

@@ -65,6 +65,7 @@ struct DDS_PIXELFORMAT
 #define DDS_RGB         0x00000040  // DDPF_RGB
 #define DDS_LUMINANCE   0x00020000  // DDPF_LUMINANCE
 #define DDS_ALPHA       0x00000002  // DDPF_ALPHA
+#define DDS_BUMPDUDV    0x00080000  // DDPF_BUMPDUDV
 
 #define DDS_HEADER_FLAGS_VOLUME         0x00800000  // DDSD_DEPTH
 
@@ -579,7 +580,7 @@ static DXGI_FORMAT GetDXGIFormat( const DDS_PIXELFORMAT& ddpf )
             // No DXGI format maps to ISBITMASK(0x000000ff,0x0000ff00,0x00ff0000,0x00000000) aka D3DFMT_X8B8G8R8
 
             // Note that many common DDS reader/writers (including D3DX) swap the
-            // the RED/BLUE masks for 10:10:10:2 formats. We assumme
+            // the RED/BLUE masks for 10:10:10:2 formats. We assume
             // below that the 'backwards' header mask is being used since it is most
             // likely written by D3DX. The more robust solution is to use the 'DX10'
             // header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly
@@ -662,6 +663,32 @@ static DXGI_FORMAT GetDXGIFormat( const DDS_PIXELFORMAT& ddpf )
             return DXGI_FORMAT_A8_UNORM;
         }
     }
+    else if (ddpf.flags & DDS_BUMPDUDV)
+    {
+        if (16 == ddpf.RGBBitCount)
+        {
+            if (ISBITMASK(0x00ff, 0xff00, 0x0000, 0x0000))
+            {
+                return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
+            }
+        }
+
+        if (32 == ddpf.RGBBitCount)
+        {
+            if (ISBITMASK(0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000))
+            {
+                return DXGI_FORMAT_R8G8B8A8_SNORM; // D3DX10/11 writes this out as DX10 extension
+            }
+            if (ISBITMASK(0x0000ffff, 0xffff0000, 0x00000000, 0x00000000))
+            {
+                return DXGI_FORMAT_R16G16_SNORM; // D3DX10/11 writes this out as DX10 extension
+            }
+
+            // No DXGI format maps to ISBITMASK(0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000) aka D3DFMT_A2W10V10U10
+        }
+    }
+
+
     else if (ddpf.flags & DDS_FOURCC)
     {
         if (MAKEFOURCC( 'D', 'X', 'T', '1' ) == ddpf.fourCC)
@@ -677,7 +704,7 @@ static DXGI_FORMAT GetDXGIFormat( const DDS_PIXELFORMAT& ddpf )
             return DXGI_FORMAT_BC3_UNORM;
         }
 
-        // While pre-mulitplied alpha isn't directly supported by the DXGI formats,
+        // While pre-multiplied alpha isn't directly supported by the DXGI formats,
         // they are basically the same as these BC formats so they can be mapped
         if (MAKEFOURCC( 'D', 'X', 'T', '2' ) == ddpf.fourCC)
         {
@@ -1048,6 +1075,11 @@ static HRESULT CreateD3DResources( _In_ ID3D11Device* d3dDevice,
                             SRVDesc.Texture2D.MipLevels = (!mipCount) ? -1 : desc.MipLevels;
                         }
 
+                        if (SRVDesc.Format == DXGI_FORMAT_R32_TYPELESS)
+                        {
+                            SRVDesc.Format = DXGI_FORMAT_R32_FLOAT;
+                        }
+
                         hr = d3dDevice->CreateShaderResourceView( tex,
                                                                   &SRVDesc,
                                                                   textureView

eyefinity_sample/dxut/Core/DDSTextureLoader.h

@@ -22,7 +22,7 @@
 #pragma once
 #endif
 
-#include <d3d11_1.h>
+#include <d3d11.h>
 
 #pragma warning(push)
 #pragma warning(disable : 4005)

eyefinity_sample/dxut/Core/DXUT.cpp

@@ -93,9 +93,11 @@ class DXUTState
         ID3D11RenderTargetView* m_D3D11RenderTargetView;   // the D3D11 render target view
         ID3D11RasterizerState*  m_D3D11RasterizerState;    // the D3D11 Rasterizer state
 
+#ifdef USE_DIRECT3D11_1
         // D3D11.1 specific
         ID3D11Device1*          m_D3D11Device1;            // the D3D11.1 rendering device
         ID3D11DeviceContext1*	m_D3D11DeviceContext1;	   // the D3D11.1 immediate device context
+#endif
 
 #ifdef USE_DIRECT3D11_2
         // D3D11.2 specific
@@ -310,8 +312,10 @@ class DXUTState
     GET_SET_ACCESSOR( ID3D11RenderTargetView*, D3D11RenderTargetView );
     GET_SET_ACCESSOR( ID3D11RasterizerState*, D3D11RasterizerState );
 
+#ifdef USE_DIRECT3D11_1
     GET_SET_ACCESSOR( ID3D11Device1*, D3D11Device1 );
     GET_SET_ACCESSOR( ID3D11DeviceContext1*, D3D11DeviceContext1 );
+#endif
 
 #ifdef USE_DIRECT3D11_2
     GET_SET_ACCESSOR(ID3D11Device2*, D3D11Device2);
@@ -607,8 +611,11 @@ IDXGIFactory1* WINAPI DXUTGetDXGIFactory()                 { DXUTDelayLoadDXGI()
 
 ID3D11Device* WINAPI DXUTGetD3D11Device()                  { return GetDXUTState().GetD3D11Device(); }
 ID3D11DeviceContext* WINAPI DXUTGetD3D11DeviceContext()    { return GetDXUTState().GetD3D11DeviceContext(); }
+
+#ifdef USE_DIRECT3D11_1
 ID3D11Device1* WINAPI DXUTGetD3D11Device1()                { return GetDXUTState().GetD3D11Device1(); }
 ID3D11DeviceContext1* WINAPI DXUTGetD3D11DeviceContext1()  { return GetDXUTState().GetD3D11DeviceContext1(); }
+#endif
 
 #ifdef USE_DIRECT3D11_2
 ID3D11Device2* WINAPI DXUTGetD3D11Device2()                { return GetDXUTState().GetD3D11Device2(); }
@@ -752,9 +759,13 @@ void DXUTParseCommandLine(WCHAR* strCommandLine,
                     }
                     else
 #endif
+#ifdef USE_DIRECT3D11_1
                     if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_11_1", MAX_PATH) == 0 ) {
                         GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_11_1);
-                    }else if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_11_0", MAX_PATH) == 0 ) {
+                    }
+                    else
+#endif
+                    if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_11_0", MAX_PATH) == 0 ) {
                         GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_11_0);
                     }else if (_wcsnicmp( strFlag, L"D3D_FEATURE_LEVEL_10_1", MAX_PATH) == 0 ) {
                         GetDXUTState().SetOverrideForceFeatureLevel(D3D_FEATURE_LEVEL_10_1);
@@ -2572,6 +2583,7 @@ HRESULT DXUTCreate3DEnvironment11()
     assert( pd3dImmediateContext );
     _Analysis_assume_( pd3dImmediateContext );
 
+#ifdef USE_DIRECT3D11_1
     // Direct3D 11.1
     {
         ID3D11Device1* pd3d11Device1 = nullptr;
@@ -2588,6 +2600,7 @@ HRESULT DXUTCreate3DEnvironment11()
             }
         }
     }
+#endif
 
 #ifdef USE_DIRECT3D11_2
     // Direct3D 11.2
@@ -3046,10 +3059,12 @@ void DXUTCleanup3DEnvironment( _In_ bool bReleaseSettings )
         assert( pImmediateContext );
         pImmediateContext->ClearState();
         pImmediateContext->Flush();
+#ifdef USE_DIRECT3D11_1
         auto pImmediateContext1 = DXUTGetD3D11DeviceContext1();
-        assert( pImmediateContext1 );
+        assert(pImmediateContext1);
         pImmediateContext1->ClearState();
         pImmediateContext1->Flush();
+#endif
 #ifdef USE_DIRECT3D11_2
         auto pImmediateContext2 = DXUTGetD3D11DeviceContext2();
         assert(pImmediateContext2);
@@ -3067,8 +3082,10 @@ void DXUTCleanup3DEnvironment( _In_ bool bReleaseSettings )
         SAFE_RELEASE( pImmediateContext );
         GetDXUTState().SetD3D11DeviceContext( nullptr );
 
+#ifdef USE_DIRECT3D11_1
         SAFE_RELEASE( pImmediateContext1 );
         GetDXUTState().SetD3D11DeviceContext1( nullptr );
+#endif
 
 #ifdef USE_DIRECT3D11_2
         SAFE_RELEASE(pImmediateContext2);
@@ -3083,9 +3100,11 @@ void DXUTCleanup3DEnvironment( _In_ bool bReleaseSettings )
         // Report live objects
         if ( pd3dDevice )
         {
+#ifdef USE_DIRECT3D11_1
             auto pd3dDevice1 = DXUTGetD3D11Device1();
             SAFE_RELEASE( pd3dDevice1 );
             GetDXUTState().SetD3D11Device1(nullptr);
+#endif
 
 #ifdef USE_DIRECT3D11_2
             auto pd3dDevice2 = DXUTGetD3D11Device2();
@@ -4201,9 +4220,11 @@ void DXUTUpdateD3D11DeviceStats( D3D_DRIVER_TYPE DeviceType, D3D_FEATURE_LEVEL f
     case D3D_FEATURE_LEVEL_11_0:
         wcscat_s( pstrDeviceStats, 256, L" (FL 11.0)" );
         break;
+#ifdef USE_DIRECT3D11_1
     case D3D_FEATURE_LEVEL_11_1:
         wcscat_s( pstrDeviceStats, 256, L" (FL 11.1)" );
         break;
+#endif
 #ifdef USE_DIRECT3D11_3
     case D3D_FEATURE_LEVEL_12_0:
         wcscat_s(pstrDeviceStats, 256, L" (FL 12.0)");

eyefinity_sample/dxut/Core/DXUT.h

@@ -20,29 +20,37 @@
 #define STRICT
 #endif
 
-// If app hasn't choosen, set to work with Windows Vista and beyond
+// If app hasn't choosen, set to work with Windows 7 and beyond
 #ifndef WINVER
-#define WINVER         0x0600
+#define WINVER         0x0601
 #endif
 #ifndef _WIN32_WINDOWS
-#define _WIN32_WINDOWS 0x0600
+#define _WIN32_WINDOWS 0x0601
 #endif
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT   0x0600
+#define _WIN32_WINNT   0x0601
 #endif
 
 #if (_WIN32_WINNT >= 0x0A00) && !defined(USE_DIRECT3D11_3)
-#define DIRECT3D11_3
+#define USE_DIRECT3D11_3
 #endif
 
 #if (_WIN32_WINNT >= 0x0603) && !defined(USE_DIRECT3D11_2)
-#define DIRECT3D11_2
+#define USE_DIRECT3D11_2
 #endif
 
 #if defined(USE_DIRECT3D11_3) && !defined(USE_DIRECT3D11_2)
 #define USE_DIRECT3D11_2
 #endif
 
+#if (_WIN32_WINNT >= 0x0602) && !defined(USE_DIRECT3D11_1)
+#define USE_DIRECT3D11_1
+#endif
+
+#if defined(USE_DIRECT3D11_2) && !defined(USE_DIRECT3D11_1)
+#define USE_DIRECT3D11_1
+#endif
+
 // #define DXUT_AUTOLIB to automatically include the libs needed for DXUT 
 #ifdef DXUT_AUTOLIB
 #pragma comment( lib, "comctl32.lib" )
@@ -78,9 +86,13 @@
 // Direct3D11 includes
 #include <d3dcommon.h>
 #include <dxgi.h>
-#include <d3d11_1.h>
+#include <d3d11.h>
 #include <d3dcompiler.h>
 
+#ifdef USE_DIRECT3D11_1
+#include <d3d11_1.h>
+#endif
+
 #ifdef USE_DIRECT3D11_2
 #include <d3d11_2.h>
 #endif
@@ -142,7 +154,7 @@
     ((DWORD)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))
 #endif
 
-#define DXUT_VERSION 1110
+#define DXUT_VERSION 1111
 
 //--------------------------------------------------------------------------------------
 // Structs
@@ -291,8 +303,10 @@ ID3D11DepthStencilView*  WINAPI DXUTGetD3D11DepthStencilView();
 ID3D11Device*            WINAPI DXUTGetD3D11Device();
 ID3D11DeviceContext*     WINAPI DXUTGetD3D11DeviceContext();
 
+#ifdef USE_DIRECT3D11_1
 ID3D11Device1*           WINAPI DXUTGetD3D11Device1();
 ID3D11DeviceContext1*	 WINAPI DXUTGetD3D11DeviceContext1();
+#endif
 
 #ifdef USE_DIRECT3D11_2
 ID3D11Device2*           WINAPI DXUTGetD3D11Device2();