From dec930150f42a22892e567c769a1c9e24e761fde Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Wed, 19 Oct 2022 09:36:41 -0700
Subject: PersistentShaderCache integration (#2453)

* Shader cache index integrated into RendererBase; Added test for cache eviction policy (which currently does not pass)

* Restructured main if block in getEntryPointCodeFromShaderCache; Post-rebase cleanup

* undo local testing only change

* Fixed issues causing shader cache tests to fail

* Edited gfx.slang to reflect structural changes to IDevice::Desc and to include ShaderCacheDesc; Modified how the cache is reading in the file from disk; Added a check to the cache eviction policy test that checks for correct order of entries in the cache as well as eight total expected output files for D3D12 and Vulkan

* Removed line in gfx-unit-test.cpp for local testing

* Edited .gitignore to ignore all shaders automatically generated by the shader cache tests and removed the test shaders that were previously added; Review changes, most notably with an overhaul of how the cache eviction policy test handles checking order of entries

* Ran premake; Removed local testing specific line (again)

* Removed expected comparison files from earlier commit; Ran premake

* Edited premake5.lua to also ignore the auto-generated shader files from specific shader cache tests

* Fixed weird indent in premake5.lua
---
 .../gfx-unit-test-tool/gfx-unit-test-tool.vcxproj      |  6 ------
 .../gfx-unit-test-tool.vcxproj.filters                 | 18 ------------------
 2 files changed, 24 deletions(-)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj
index 7553119d3..588cad8bd 100644
--- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj
+++ b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj
@@ -308,8 +308,6 @@
     <None Include="..\..\..\tools\gfx-unit-test\compute-trivial.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\format-test-shaders.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\graphics-smoke.slang" />
-    <None Include="..\..\..\tools\gfx-unit-test\imported.slang" />
-    <None Include="..\..\..\tools\gfx-unit-test\importing-shader-cache-shader.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\multiple-entry-point-shader-cache-shader.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\mutable-shader-object.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\nested-parameter-block.slang" />
@@ -317,10 +315,6 @@
     <None Include="..\..\..\tools\gfx-unit-test\resolve-resource-shader.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\root-shader-parameter.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\sampler-array.slang" />
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader-A.slang" />
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader-B.slang" />
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader-C.slang" />
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\swapchain-shader.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\trivial-copy-textures.slang" />
     <None Include="..\..\..\tools\gfx-unit-test\trivial-copy.slang" />
diff --git a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters
index 90dc02b69..cb19b733d 100644
--- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters
+++ b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters
@@ -121,12 +121,6 @@
     <None Include="..\..\..\tools\gfx-unit-test\graphics-smoke.slang">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\..\..\tools\gfx-unit-test\imported.slang">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="..\..\..\tools\gfx-unit-test\importing-shader-cache-shader.slang">
-      <Filter>Source Files</Filter>
-    </None>
     <None Include="..\..\..\tools\gfx-unit-test\multiple-entry-point-shader-cache-shader.slang">
       <Filter>Source Files</Filter>
     </None>
@@ -148,18 +142,6 @@
     <None Include="..\..\..\tools\gfx-unit-test\sampler-array.slang">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader-A.slang">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader-B.slang">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader-C.slang">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="..\..\..\tools\gfx-unit-test\shader-cache-shader.slang">
-      <Filter>Source Files</Filter>
-    </None>
     <None Include="..\..\..\tools\gfx-unit-test\swapchain-shader.slang">
       <Filter>Source Files</Filter>
     </None>
-- 
cgit v1.2.3