Merge remote-tracking branch 'origin/master' into user/amarp/sdk

Author: amarpMSFT

.gitignore

@@ -21,3 +21,11 @@
 *.opendb
 Samples/Desktop/D3D12HelloWorld/src/HelloVAResourceInterop/*.h264
 Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/*.h264
+/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/x64
+/Samples/Desktop/D3D12Raytracing/src/x64
+/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/leavesOMM.bin
+/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/treeModel.bin
+/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/treeOMM.bin
+/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/jacaranda_tree_4k.obj
+
+/Samples/Desktop/**/x64

Libraries/D3DX12Residency/d3dx12Residency.h

@@ -406,9 +406,16 @@ namespace D3DX12Residency
 
             HRESULT GPUWait(ID3D12CommandQueue* pQueue)
             {
-                HRESULT hr = pQueue->Wait(pFence, FenceValue);
-                RESIDENCY_CHECK_RESULT(hr);
-                return hr;
+                if (FenceValue > 0)
+                {
+                    HRESULT hr = pQueue->Wait(pFence, FenceValue);
+                    RESIDENCY_CHECK_RESULT(hr);
+                    return hr;
+                }
+                else
+                {
+                    return S_OK;
+                }
             }
 
             HRESULT GPUSignal(ID3D12CommandQueue* pQueue)
@@ -1332,6 +1339,7 @@ namespace D3DX12Residency
                                 LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident), TotalBudget, pEvictionList, NumObjectsToEvict, GenerationToWaitFor);
 
                                 RESIDENCY_CHECK_RESULT(Device->Evict(NumObjectsToEvict, pEvictionList));
+                                NumObjectsToEvict = 0;
                             }
                             else
                             {

MiniEngine/Core/Core.vcxproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -436,19 +437,20 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\include;..\..\Packages\WinPixEventRuntime.1.0.210209001\Include\WinPixEventRuntime;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Packages\WinPixEventRuntime.1.0.210209001\Include\WinPixEventRuntime;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_GAMING_DESKTOP;__WRL_NO_DEFAULT_LIB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets" Condition="Exists('..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" />
-    <Import Project="..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets')" />
+    <Import Project="..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
+    <Import Project="..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
-    <Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.231030001\build\WinPixEventRuntime.targets'))" />
+    <Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
+    <Error Condition="!Exists('..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props'))" />
+    <Error Condition="!Exists('..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets'))" />
   </Target>
 </Project>

MiniEngine/Core/FileUtility.cpp

@@ -14,8 +14,7 @@
 #include "pch.h"
 #include "FileUtility.h"
 #include <fstream>
-#include <mutex>
-#include <zlib.h> // From NuGet package 
+//#include <zlib.h> // From NuGet package 
 
 using namespace std;
 using namespace Utility;
@@ -25,7 +24,7 @@ namespace Utility
     ByteArray NullFile = make_shared<vector<byte> > (vector<byte>() );
 }
 
-ByteArray DecompressZippedFile( wstring& fileName );
+//ByteArray DecompressZippedFile( wstring& fileName );
 
 ByteArray ReadFileHelper(const wstring& fileName)
 {
@@ -47,14 +46,15 @@ ByteArray ReadFileHelper(const wstring& fileName)
 
 ByteArray ReadFileHelperEx( shared_ptr<wstring> fileName)
 {
-    std::wstring zippedFileName = *fileName + L".gz";
-    ByteArray firstTry = DecompressZippedFile(zippedFileName);
-    if (firstTry != NullFile)
-        return firstTry;
+    //std::wstring zippedFileName = *fileName + L".gz";
+    //ByteArray firstTry = DecompressZippedFile(zippedFileName);
+    //if (firstTry != NullFile)
+    //    return firstTry;
 
     return ReadFileHelper(*fileName);
 }
 
+/*
 ByteArray Inflate(ByteArray CompressedSource, int& err, uint32_t ChunkSize = 0x100000 ) 
 {
     // Create a dynamic buffer to hold compressed blocks
@@ -123,6 +123,7 @@ ByteArray DecompressZippedFile( wstring& fileName )
 
     return DecompressedFile;
 }
+*/
 
 ByteArray Utility::ReadFileSync( const wstring& fileName)
 {

MiniEngine/Core/GraphicsCore.cpp

@@ -354,6 +354,9 @@ void Graphics::Initialize(bool RequireDXRSupport)
 
             // Suppress errors from calling ResolveQueryData with timestamps that weren't requested on a given frame.
             D3D12_MESSAGE_ID_RESOLVE_QUERY_INVALID_QUERY_STATE,
+
+            // Ignoring InitialState D3D12_RESOURCE_STATE_COPY_DEST. Buffers are effectively created in state D3D12_RESOURCE_STATE_COMMON.
+            D3D12_MESSAGE_ID_CREATERESOURCE_STATE_IGNORED,
         };
 
         D3D12_INFO_QUEUE_FILTER NewFilter = {};

MiniEngine/Core/Math/Frustum.cpp

@@ -61,12 +61,12 @@ void Frustum::ConstructOrthographicFrustum( float Left, float Right, float Top,
     m_FrustumCorners[ kFarUpperRight  ] = Vector3(Right,  Top,		 -Back);	// Far upper right
 
     // Define the bounding planes
-    m_FrustumPlanes[kNearPlane]		= BoundingPlane(  0.0f,  0.0f, -1.0f, -Front );
-    m_FrustumPlanes[kFarPlane]		= BoundingPlane(  0.0f,  0.0f,  1.0f,   Back );
-    m_FrustumPlanes[kLeftPlane]		= BoundingPlane(  1.0f,  0.0f,  0.0f,  -Left );
-    m_FrustumPlanes[kRightPlane]	= BoundingPlane( -1.0f,  0.0f,  0.0f,  Right );
-    m_FrustumPlanes[kTopPlane]		= BoundingPlane(  0.0f, -1.0f,  0.0f, Bottom );
-    m_FrustumPlanes[kBottomPlane]	= BoundingPlane(  0.0f,  1.0f,  0.0f,   -Top );
+    m_FrustumPlanes[kNearPlane]     = BoundingPlane(  0.0f,  0.0f,  1.0f, -Front );
+    m_FrustumPlanes[kFarPlane]      = BoundingPlane(  0.0f,  0.0f, -1.0f,  Back );
+    m_FrustumPlanes[kLeftPlane]     = BoundingPlane(  1.0f,  0.0f,  0.0f, -Left );
+    m_FrustumPlanes[kRightPlane]    = BoundingPlane( -1.0f,  0.0f,  0.0f,  Right );
+    m_FrustumPlanes[kBottomPlane]   = BoundingPlane(  0.0f,  1.0f,  0.0f, -Bottom );
+    m_FrustumPlanes[kTopPlane]      = BoundingPlane(  0.0f, -1.0f,  0.0f,  Top );
 }
 
 
@@ -82,11 +82,11 @@ Frustum::Frustum( const Matrix4& ProjMat )
     if (ProjMatF[3] == 0.0f && ProjMatF[7] == 0.0f && ProjMatF[11] == 0.0f && ProjMatF[15] == 1.0f)
     {
         // Orthographic
-        float Left	 = (-1.0f - ProjMatF[12]) * RcpXX;
-        float Right	 = ( 1.0f - ProjMatF[12]) * RcpXX;
-        float Top	 = ( 1.0f - ProjMatF[13]) * RcpYY;
+        float Left   = (-1.0f - ProjMatF[12]) * RcpXX;
+        float Right  = ( 1.0f - ProjMatF[12]) * RcpXX;
+        float Top    = ( 1.0f - ProjMatF[13]) * RcpYY;
         float Bottom = (-1.0f - ProjMatF[13]) * RcpYY;
-        float Front	 = ( 0.0f - ProjMatF[14]) * RcpZZ;
+        float Front  = ( 0.0f - ProjMatF[14]) * RcpZZ;
         float Back   = ( 1.0f - ProjMatF[14]) * RcpZZ;
 
         // Check for reverse Z here.  The bounding planes need to point into the frustum.

MiniEngine/Core/ParticleEffectManager.cpp

@@ -388,7 +388,7 @@ namespace
 void ParticleEffectManager::Initialize( uint32_t MaxDisplayWidth, uint32_t MaxDisplayHeight )
 {	
     D3D12_SAMPLER_DESC SamplerBilinearBorderDesc = SamplerPointBorderDesc;
-    SamplerBilinearBorderDesc.Filter = D3D12_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT;
+    SamplerBilinearBorderDesc.Filter = D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT;
 
     RootSig.Reset(5, 3);
     RootSig.InitStaticSampler(0, SamplerBilinearBorderDesc);

MiniEngine/Core/SamplerManager.h

@@ -30,7 +30,7 @@ class SamplerDesc : public D3D12_SAMPLER_DESC
         AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP;
         MipLODBias = 0.0f;
         MaxAnisotropy = 16;
-        ComparisonFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL;
+        ComparisonFunc = D3D12_COMPARISON_FUNC_NONE;
         BorderColor[0] = 1.0f;
         BorderColor[1] = 1.0f;
         BorderColor[2] = 1.0f;

MiniEngine/Core/Shaders/BicubicFilterFunctions.hlsli

@@ -31,7 +31,7 @@ float4 GetBicubicFilterWeights(float offset, float A)
     //return ComputeWeights(offset, A);
 
     // Precompute weights for 16 discrete offsets
-    static const float4 FilterWeights[16] =
+    const float4 FilterWeights[16] =
     {
         ComputeWeights( 0.5 / 16.0, -0.5),
         ComputeWeights( 1.5 / 16.0, -0.5),

MiniEngine/Core/Shaders/BlurCS.hlsl

@@ -34,7 +34,7 @@ float3 BlurPixels( float3 a, float3 b, float3 c, float3 d, float3 e, float3 f, f
     return Weights[0]*e + Weights[1]*(d+f) + Weights[2]*(c+g) + Weights[3]*(b+h) + Weights[4]*(a+i);
 }
 
-// 16x16 pixels with an 8x8 center that we will be blurring writing out.  Each uint is two color channels packed together
+// 16x16 pixels with an 8x8 center that we will be blurring writing out. Each uint is two color channels packed together
 groupshared uint CacheR[128];
 groupshared uint CacheG[128];
 groupshared uint CacheB[128];
@@ -67,7 +67,7 @@ void Load1Pixel( uint index, out float3 pixel )
     pixel = asfloat( uint3(CacheR[index], CacheG[index], CacheB[index]) );
 }
 
-// Blur two pixels horizontally.  This reduces LDS reads and pixel unpacking.
+// Blur two pixels horizontally. This reduces LDS reads and pixel unpacking.
 void BlurHorizontally( uint outIndex, uint leftMostIndex )
 {
     float3 s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
@@ -77,6 +77,9 @@ void BlurHorizontally( uint outIndex, uint leftMostIndex )
     Load2Pixels( leftMostIndex + 3, s6, s7 );
     Load2Pixels( leftMostIndex + 4, s8, s9 );
 
+    // Be sure to finish loading values before we rewrite them.
+    GroupMemoryBarrierWithGroupSync();
+ 
     Store1Pixel(outIndex  , BlurPixels(s0, s1, s2, s3, s4, s5, s6, s7, s8));
     Store1Pixel(outIndex+1, BlurPixels(s1, s2, s3, s4, s5, s6, s7, s8, s9));
 }
@@ -104,8 +107,8 @@ void main( uint3 Gid : SV_GroupID, uint3 GTid : SV_GroupThreadID, uint3 DTid : S
     //
     // Load 4 pixels per thread into LDS
     //
-    int2 GroupUL = (Gid.xy << 3) - 4;                // Upper-left pixel coordinate of group read location
-    int2 ThreadUL = (GTid.xy << 1) + GroupUL;        // Upper-left pixel coordinate of quad that this thread will read
+    int2 GroupUL = (Gid.xy << 3) - 4;           // Upper-left pixel coordinate of group read location
+    int2 ThreadUL = (GTid.xy << 1) + GroupUL;   // Upper-left pixel coordinate of quad that this thread will read
 
     //
     // Store 4 unblurred pixels in LDS