diff options
| author | lucy96chen <47800040+lucy96chen@users.noreply.github.com> | 2022-10-13 17:07:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 17:07:54 -0700 |
| commit | 27d7961db15ed5890d2ad0eff1218e26dcdaf82c (patch) | |
| tree | dea259ca9768bb94f8371f0bd113c0341eb01b6b /source/compiler-core/slang-dxc-compiler.cpp | |
| parent | e03026a07c4aa32c1a2de5ce199d910d74511c27 (diff) | |
Shader cache index header (#2448)
* checkpoint
* Added shaderCachePath field to IDevice desc in gfx.slang, gfx-smoke.slang should be functional
* ran premake
* Revert erroneous commits from rebasing
* Added ShaderCacheIndex class header with design details
* Header edits
* more header edits
* Post-rebase premake.bat run to fix solution weirdness; Initialize commitHash to nullptr and check that a commitHash is successfully returned
Diffstat (limited to 'source/compiler-core/slang-dxc-compiler.cpp')
| -rw-r--r-- | source/compiler-core/slang-dxc-compiler.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/compiler-core/slang-dxc-compiler.cpp b/source/compiler-core/slang-dxc-compiler.cpp index 6619d000c..52933eaa7 100644 --- a/source/compiler-core/slang-dxc-compiler.cpp +++ b/source/compiler-core/slang-dxc-compiler.cpp @@ -599,16 +599,19 @@ SlangResult DXCDownstreamCompiler::getVersionString(slang::IBlob** outVersionStr versionString.append("."); versionString.append(minor); - char* commitHash; + char* commitHash = nullptr; uint32_t unused; versionInfo2->GetCommitInfo(&unused, &commitHash); + if (commitHash) + { + // Successfully queried the commit hash, append to the version and return. + versionString.append(commitHash); + CoTaskMemFree(commitHash); - versionString.append(commitHash); - CoTaskMemFree(commitHash); - - version = StringBlob::create(versionString.getBuffer()); - *outVersionString = version.detach(); - return SLANG_OK; + version = StringBlob::create(versionString.getBuffer()); + *outVersionString = version.detach(); + return SLANG_OK; + } } } |
