diff options
| author | lucy96chen <47800040+lucy96chen@users.noreply.github.com> | 2022-10-19 09:36:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-19 09:36:41 -0700 |
| commit | dec930150f42a22892e567c769a1c9e24e761fde (patch) | |
| tree | 92eea81e0c5d08c2c5ff090e7ebb0c2030648912 /tools/gfx/renderer-shared.h | |
| parent | 8add41a6e37994577d928bc312801ddfa1c33173 (diff) | |
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
Diffstat (limited to 'tools/gfx/renderer-shared.h')
| -rw-r--r-- | tools/gfx/renderer-shared.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/gfx/renderer-shared.h b/tools/gfx/renderer-shared.h index fc1c35d20..01111e292 100644 --- a/tools/gfx/renderer-shared.h +++ b/tools/gfx/renderer-shared.h @@ -5,6 +5,8 @@ #include "core/slang-basic.h" #include "core/slang-com-object.h" +#include "persistent-shader-cache.h" + #include "resource-desc-utils.h" namespace gfx @@ -1372,10 +1374,7 @@ public: SlangContext slangContext; ShaderCache shaderCache; - // TODO: These should be removed when ShaderCacheIndex is ready to be integrated. ShaderCacheIndex - // will be responsible for keeping track of the underlying filesystem for the cache. - ISlangFileSystem* shaderCacheFileSystem = nullptr; - ComPtr<ISlangMutableFileSystem> mutableShaderCacheFileSystem = nullptr; + RefPtr<PersistentShaderCache> persistentShaderCache = nullptr; Slang::Dictionary<slang::TypeLayoutReflection*, Slang::RefPtr<ShaderObjectLayoutBase>> m_shaderObjectLayoutCache; Slang::ComPtr<IPipelineCreationAPIDispatcher> m_pipelineCreationAPIDispatcher; |
