sdk version cleanups

Author: amarpMSFT

Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.cpp

@@ -16,7 +16,7 @@
 #include <atlbase.h>
 #include <vector>
 
-extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 619; }
+extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = D3D12_SDK_VERSION; }
 extern "C" { __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; }
 
 
@@ -284,6 +284,18 @@ void D3D12RaytracingHelloShaderExecutionReordering::CreateRaytracingPipelineStat
     ThrowIfFalse(SM.HighestShaderModel >= D3D_SHADER_MODEL_6_9,
         L"ERROR: Device doesn't support Shader Model 6.9.\n\n");
 
+    D3D12_FEATURE_DATA_D3D12_OPTIONS22 Options22 = {};
+    m_dxrDevice->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS22, &Options22, sizeof(Options22));
+    if (Options22.ShaderExecutionReorderingActuallyReorders)
+    {
+        PRINT("ShaderExecutionReorderingActuallyReorders = TRUE on this device.\n");
+    }
+    else
+    {
+        PRINT("ShaderExecutionReorderingActuallyReorders = TRUE on this device.\n");
+    }
+    m_shaderExecutionReorderingActuallyReorders = Options22.ShaderExecutionReorderingActuallyReorders;
+
     // Create 7 subobjects that combine into a RTPSO:
     // Subobjects need to be associated with DXIL exports (i.e. shaders) either by way of default or explicit associations.
     // Default association applies to every exported shader entrypoint that doesn't have any of the same type of subobject associated with it.
@@ -781,8 +793,9 @@ void D3D12RaytracingHelloShaderExecutionReordering::CalculateFrameStats()
         wstringstream windowText;
 
         windowText //<< setprecision(2) << fixed
-            << L"    fps: " << fps << L"     ~Million Primary Rays/s: " << MRaysPerSecond
-            << L"    GPU[" << m_deviceResources->GetAdapterID() << L"]: " << m_deviceResources->GetAdapterDescription();
+            << L"    fps: " << fps << L"     ~MegaRays/s: " << MRaysPerSecond
+            << L"    GPU[" << m_deviceResources->GetAdapterID() << L"]: " << m_deviceResources->GetAdapterDescription()
+            << L"    Device reports ShaderExecutionReorderingActuallyReorders=" << (m_shaderExecutionReorderingActuallyReorders ? L"TRUE" : L"FALSE");
         SetCustomWindowText(windowText.str().c_str());
     }
 }

Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.h

@@ -53,6 +53,7 @@ class D3D12RaytracingHelloShaderExecutionReordering : public DXSample
 
     // DirectX Raytracing (DXR) attributes
     ComPtr<ID3D12Device5> m_dxrDevice;
+    BOOL m_shaderExecutionReorderingActuallyReorders = FALSE;
     ComPtr<ID3D12GraphicsCommandList4> m_dxrCommandList;
     ComPtr<ID3D12StateObject> m_dxrStateObject;
 

Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.cpp

@@ -22,7 +22,7 @@
 #include "SharedCode.h"
 #include <random>
 
-extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 619; }
+extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = D3D12_SDK_VERSION; }
 extern "C" { __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; }
 
 using namespace std;