Skip to content

perf: use unordered_dense maps, misc optimisation #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alandtse merged 1 commit into from
Jul 17, 2025
Merged

perf: use unordered_dense maps, misc optimisation #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ShaderCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ namespace SIE
{
using enum RE::ImageSpaceManager::ImageSpaceEffectEnum;

static const std::unordered_map<std::string_view, uint32_t> descriptors{
static const ankerl::unordered_dense::map<std::string_view, uint32_t> descriptors{
// { "BSImagespaceShaderISBlur", static_cast<uint32_t>(ISBlur) },
// { "BSImagespaceShaderBlur3", static_cast<uint32_t>(ISBlur3) },
// { "BSImagespaceShaderBlur5", static_cast<uint32_t>(ISBlur5) },
Expand Down
29 changes: 14 additions & 15 deletions src/ShaderCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,15 +647,14 @@ namespace SIE

~ShaderCache();

std::array<eastl::unordered_map<uint32_t, std::unique_ptr<RE::BSGraphics::VertexShader>>,
static_cast<size_t>(RE::BSShader::Type::Total)>
vertexShaders;
std::array<eastl::unordered_map<uint32_t, std::unique_ptr<RE::BSGraphics::PixelShader>>,
static_cast<size_t>(RE::BSShader::Type::Total)>
pixelShaders;
std::array<eastl::unordered_map<uint32_t, std::unique_ptr<RE::BSGraphics::ComputeShader>>,
static_cast<size_t>(RE::BSShader::Type::Total)>
computeShaders;
template <typename ShaderType>
using ShaderMapArray = std::array<
ankerl::unordered_dense::map<uint32_t, std::unique_ptr<ShaderType>>,
RE::BSShader::Type::Total>;

ShaderMapArray<RE::BSGraphics::VertexShader> vertexShaders;
ShaderMapArray<RE::BSGraphics::PixelShader> pixelShaders;
ShaderMapArray<RE::BSGraphics::ComputeShader> computeShaders;

bool isEnabled = true;
bool isDiskCache = true;
Expand All @@ -669,12 +668,12 @@ namespace SIE
std::mutex pixelShadersMutex;
std::mutex computeShadersMutex;
CompilationSet compilationSet;
std::unordered_map<std::string, ShaderCacheResult> shaderMap{};
std::mutex mapMutex; // guard for shaderMap
std::unordered_map<std::string, system_clock::time_point> modifiedShaderMap{}; // hashmap when a shader source file last modified
std::mutex modifiedMapMutex; // guard for modifiedShaderMap
std::unordered_map<std::string, std::set<hlslRecord>> hlslToShaderMap{}; // hashmap linking specific hlsl files to shader keys in shaderMap
std::mutex hlslMapMutex; // guard for hlslToShaderMap
ankerl::unordered_dense::map<std::string, ShaderCacheResult> shaderMap{};
std::mutex mapMutex; // guard for shaderMap
ankerl::unordered_dense::map<std::string, system_clock::time_point> modifiedShaderMap{}; // hashmap when a shader source file last modified
std::mutex modifiedMapMutex; // guard for modifiedShaderMap
ankerl::unordered_dense::map<std::string, std::set<hlslRecord>> hlslToShaderMap{}; // hashmap linking specific hlsl files to shader keys in shaderMap
std::mutex hlslMapMutex; // guard for hlslToShaderMap

// efsw file watcher
efsw::FileWatcher* fileWatcher = nullptr;
Expand Down
4 changes: 1 addition & 3 deletions src/TruePBR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,11 +983,9 @@ bool TruePBR::BSLightingShader_SetupMaterial(RE::BSLightingShader* shader, RE::B
shadowState->SetPSTextureAddressMode(11, RE::BSGraphics::TextureAddressMode::kClampSClampT);
}

std::array<float, 4> characterLightParams;
std::array<float, 4> characterLightParams{}; // in C++, arrays will be zero-initialized
if (smState->characterLightEnabled) {
std::copy_n(smState->characterLightParams, 4, characterLightParams.data());
} else {
std::fill_n(characterLightParams.data(), 4, 0.f);
}
shadowState->SetPSConstant(characterLightParams, RE::BSGraphics::ConstantGroupLevel::PerMaterial, lightingPSConstants.CharacterLightParams);
}
Expand Down