aiden/video-shader-toys
1
0
Fork 0
Code Issues Pull Requests Actions Releases 5 Wiki Activity

Step 5 storng option
Some checks failed
CI / React UI Build (push) Successful in 10s
Details
CI / Native Windows Build And Tests (push) Successful in 2m41s
Details
CI / Windows Release Package (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Aiden
2026-05-11 19:20:23 +10:00
parent ff10b66d1d
commit 79855d788c
10 changed files with 247 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
apps/LoopThroughWithOpenGLCompositing/runtime/store/RuntimeStore.cpp
View File

@@ -72,9 +72,9 @@ bool RuntimeStore::InitializeStore(std::string& error)
return false;
if (!ScanShaderPackages(error))
return false;
mLayerStack.NormalizeLayerIds();
mLayerStack.EnsureDefaultsForAllLayers(mShaderCatalog);
mLayerStack.EnsureDefaultLayer(mShaderCatalog);
mCommittedLiveState.NormalizeLayerIds();
mCommittedLiveState.EnsureDefaultsForAllLayers(mShaderCatalog);
mCommittedLiveState.EnsureDefaultLayer(mShaderCatalog);
mServerPort = mConfigStore.GetConfig().serverPort;
mAutoReloadEnabled = mConfigStore.GetConfig().autoReload;
@@ -133,8 +133,8 @@ bool RuntimeStore::PollStoredFileChanges(bool& registryChanged, bool& reloadRequ
registryChanged = mShaderCatalog.HasCatalogChangedSince(previousCatalog);
mLayerStack.EnsureDefaultsForAllLayers(mShaderCatalog);
for (RuntimeStore::LayerPersistentState& layer : mLayerStack.Layers())
mCommittedLiveState.EnsureDefaultsForAllLayers(mShaderCatalog);
for (RuntimeStore::LayerPersistentState& layer : mCommittedLiveState.Layers())
{
const ShaderPackage* active = mShaderCatalog.FindPackage(layer.shaderId);
if (!active)
@@ -163,7 +163,7 @@ bool RuntimeStore::PollStoredFileChanges(bool& registryChanged, bool& reloadRequ
bool RuntimeStore::CreateStoredLayer(const std::string& shaderId, std::string& error)
{
std::lock_guard<std::mutex> lock(mMutex);
if (!mLayerStack.CreateLayer(mShaderCatalog, shaderId, error))
if (!mCommittedLiveState.CreateLayer(mShaderCatalog, shaderId, error))
return false;
mReloadRequested = true;
@@ -174,7 +174,7 @@ bool RuntimeStore::CreateStoredLayer(const std::string& shaderId, std::string& e
bool RuntimeStore::DeleteStoredLayer(const std::string& layerId, std::string& error)
{
std::lock_guard<std::mutex> lock(mMutex);
if (!mLayerStack.DeleteLayer(layerId, error))
if (!mCommittedLiveState.DeleteLayer(layerId, error))
return false;
mReloadRequested = true;
@@ -186,12 +186,12 @@ bool RuntimeStore::MoveStoredLayer(const std::string& layerId, int direction, st
{
std::lock_guard<std::mutex> lock(mMutex);
bool shouldMove = false;
if (!mLayerStack.ResolveLayerMove(layerId, direction, shouldMove, error))
if (!mCommittedLiveState.ResolveLayerMove(layerId, direction, shouldMove, error))
return false;
if (!shouldMove)
return true;
if (!mLayerStack.MoveLayer(layerId, direction, error))
if (!mCommittedLiveState.MoveLayer(layerId, direction, error))
return false;
mReloadRequested = true;
@@ -203,12 +203,12 @@ bool RuntimeStore::MoveStoredLayerToIndex(const std::string& layerId, std::size_
{
std::lock_guard<std::mutex> lock(mMutex);
bool shouldMove = false;
if (!mLayerStack.ResolveLayerMoveToIndex(layerId, targetIndex, shouldMove, error))
if (!mCommittedLiveState.ResolveLayerMoveToIndex(layerId, targetIndex, shouldMove, error))
return false;
if (!shouldMove)
return true;
if (!mLayerStack.MoveLayerToIndex(layerId, targetIndex, error))
if (!mCommittedLiveState.MoveLayerToIndex(layerId, targetIndex, error))
return false;
mReloadRequested = true;
@@ -219,7 +219,7 @@ bool RuntimeStore::MoveStoredLayerToIndex(const std::string& layerId, std::size_
bool RuntimeStore::SetStoredLayerBypassState(const std::string& layerId, bool bypassed, std::string& error)
{
std::lock_guard<std::mutex> lock(mMutex);
if (!mLayerStack.SetLayerBypassState(layerId, bypassed, error))
if (!mCommittedLiveState.SetLayerBypassState(layerId, bypassed, error))
return false;
mReloadRequested = true;
@@ -230,7 +230,7 @@ bool RuntimeStore::SetStoredLayerBypassState(const std::string& layerId, bool by
bool RuntimeStore::SetStoredLayerShaderSelection(const std::string& layerId, const std::string& shaderId, std::string& error)
{
std::lock_guard<std::mutex> lock(mMutex);
if (!mLayerStack.SetLayerShaderSelection(mShaderCatalog, layerId, shaderId, error))
if (!mCommittedLiveState.SetLayerShaderSelection(mShaderCatalog, layerId, shaderId, error))
return false;
mReloadRequested = true;
@@ -242,7 +242,7 @@ bool RuntimeStore::SetStoredParameterValue(const std::string& layerId, const std
{
std::lock_guard<std::mutex> lock(mMutex);
if (!mLayerStack.SetParameterValue(layerId, parameterId, value, error))
if (!mCommittedLiveState.SetParameterValue(layerId, parameterId, value, error))
return false;
MarkParameterStateDirtyLocked();
@@ -253,7 +253,7 @@ bool RuntimeStore::ResetStoredLayerParameterValues(const std::string& layerId, s
{
std::lock_guard<std::mutex> lock(mMutex);
if (!mLayerStack.ResetLayerParameterValues(mShaderCatalog, layerId, error))
if (!mCommittedLiveState.ResetLayerParameterValues(mShaderCatalog, layerId, error))
return false;
MarkParameterStateDirtyLocked();
@@ -271,7 +271,7 @@ bool RuntimeStore::SaveStackPresetSnapshot(const std::string& presetName, std::s
}
JsonValue root = JsonValue::MakeObject();
root = mLayerStack.BuildStackPresetValue(mShaderCatalog, presetName);
root = mCommittedLiveState.BuildStackPresetValue(mShaderCatalog, presetName);
return WriteTextFile(mConfigStore.GetPresetRoot() / (safeStem + ".json"), SerializeJson(root, true), error);
}
@@ -295,7 +295,7 @@ bool RuntimeStore::LoadStackPresetSnapshot(const std::string& presetName, std::s
if (!ParseJson(presetText, root, error))
return false;
if (!mLayerStack.LoadStackPresetValue(mShaderCatalog, root, error))
if (!mCommittedLiveState.LoadStackPresetValue(mShaderCatalog, root, error))
return false;
mReloadRequested = true;
@@ -306,7 +306,7 @@ bool RuntimeStore::LoadStackPresetSnapshot(const std::string& presetName, std::s
bool RuntimeStore::HasStoredLayer(const std::string& layerId) const
{
std::lock_guard<std::mutex> lock(mMutex);
return mLayerStack.HasLayer(layerId);
return mCommittedLiveState.HasLayer(layerId);
}
bool RuntimeStore::HasStoredShader(const std::string& shaderId) const
@@ -319,26 +319,26 @@ bool RuntimeStore::TryGetStoredParameterById(const std::string& layerId, const s
{
std::lock_guard<std::mutex> lock(mMutex);
return mLayerStack.TryGetParameterById(mShaderCatalog, layerId, parameterId, snapshot, error);
return mCommittedLiveState.TryGetParameterById(mShaderCatalog, layerId, parameterId, snapshot, error);
}
bool RuntimeStore::TryGetStoredParameterByControlKey(const std::string& layerKey, const std::string& parameterKey, StoredParameterSnapshot& snapshot, std::string& error) const
{
std::lock_guard<std::mutex> lock(mMutex);
return mLayerStack.TryGetParameterByControlKey(mShaderCatalog, layerKey, parameterKey, snapshot, error);
return mCommittedLiveState.TryGetParameterByControlKey(mShaderCatalog, layerKey, parameterKey, snapshot, error);
}
bool RuntimeStore::ResolveStoredLayerMove(const std::string& layerId, int direction, bool& shouldMove, std::string& error) const
{
std::lock_guard<std::mutex> lock(mMutex);
return mLayerStack.ResolveLayerMove(layerId, direction, shouldMove, error);
return mCommittedLiveState.ResolveLayerMove(layerId, direction, shouldMove, error);
}
bool RuntimeStore::ResolveStoredLayerMoveToIndex(const std::string& layerId, std::size_t targetIndex, bool& shouldMove, std::string& error) const
{
std::lock_guard<std::mutex> lock(mMutex);
return mLayerStack.ResolveLayerMoveToIndex(layerId, targetIndex, shouldMove, error);
return mCommittedLiveState.ResolveLayerMoveToIndex(layerId, targetIndex, shouldMove, error);
}
bool RuntimeStore::IsValidStackPresetName(const std::string& presetName) const
@@ -460,12 +460,12 @@ bool RuntimeStore::LoadPersistentState(std::string& error)
if (!ParseJson(stateText, root, error))
return false;
return mLayerStack.LoadPersistentStateValue(root);
return mCommittedLiveState.LoadPersistentStateValue(root);
}
bool RuntimeStore::SavePersistentState(std::string& error) const
{
return WriteTextFile(mConfigStore.GetRuntimeStatePath(), SerializeJson(mLayerStack.BuildPersistentStateValue(mShaderCatalog), true), error);
return WriteTextFile(mConfigStore.GetRuntimeStatePath(), SerializeJson(mCommittedLiveState.BuildPersistentStateValue(mShaderCatalog), true), error);
}
bool RuntimeStore::ScanShaderPackages(std::string& error)
@@ -473,7 +473,7 @@ bool RuntimeStore::ScanShaderPackages(std::string& error)
if (!mShaderCatalog.Scan(mConfigStore.GetShaderRoot(), mConfigStore.GetConfig().maxTemporalHistoryFrames, error))
return false;
mLayerStack.RemoveLayersWithMissingPackages(mShaderCatalog);
mCommittedLiveState.RemoveLayersWithMissingPackages(mShaderCatalog);
MarkRenderStateDirtyLocked();
return true;
@@ -548,7 +548,7 @@ std::vector<std::string> RuntimeStore::GetStackPresetNamesLocked() const
bool RuntimeStore::CopyShaderPackageForStoredLayer(const std::string& layerId, ShaderPackage& shaderPackage, std::string& error) const
{
std::lock_guard<std::mutex> lock(mMutex);
const RuntimeStore::LayerPersistentState* layer = mLayerStack.FindLayerById(layerId);
const RuntimeStore::LayerPersistentState* layer = mCommittedLiveState.FindLayerById(layerId);
if (!layer)
{
error = "Unknown layer id: " + layerId;
@@ -578,11 +578,8 @@ ShaderCompilerInputs RuntimeStore::GetShaderCompilerInputs() const
CommittedLiveStateReadModel RuntimeStore::BuildCommittedLiveStateReadModel() const
{
CommittedLiveStateReadModel model;
std::lock_guard<std::mutex> lock(mMutex);
model.layers = mLayerStack.Layers();
model.packagesById = mShaderCatalog.CaptureSnapshot().packagesById;
return model;
return mCommittedLiveState.BuildReadModel(mShaderCatalog);
}
RenderSnapshotReadModel RuntimeStore::BuildRenderSnapshotReadModel() const
@@ -599,7 +596,7 @@ RenderSnapshotReadModel RuntimeStore::BuildRenderSnapshotReadModel() const
std::vector<RuntimeStore::LayerPersistentState> RuntimeStore::CopyCommittedLiveLayerStates() const
{
std::lock_guard<std::mutex> lock(mMutex);
return mLayerStack.Layers();
return mCommittedLiveState.CopyLayerStates();
}
std::vector<RuntimeStore::LayerPersistentState> RuntimeStore::CopyLayerStates() const
@@ -622,7 +619,7 @@ RuntimeStatePresentationReadModel RuntimeStore::BuildRuntimeStatePresentationRea
model.telemetry = mHealthTelemetry.GetSnapshot();
std::lock_guard<std::mutex> lock(mMutex);
model.config = mConfigStore.GetConfig();
model.layerStack = mLayerStack;
model.layerStack = mCommittedLiveState.LayerStack();
model.shaderCatalog = mShaderCatalog.CaptureSnapshot();
model.packageStatuses = mShaderCatalog.PackageStatuses();
model.stackPresetNames = GetStackPresetNamesLocked();

3
apps/LoopThroughWithOpenGLCompositing/runtime/store/RuntimeStore.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include "HealthTelemetry.h"
#include "CommittedLiveState.h"
#include "LayerStackStore.h"
#include "RenderSnapshotBuilder.h"
#include "RuntimeConfigStore.h"
@@ -91,7 +92,7 @@ private:
RenderSnapshotBuilder mRenderSnapshotBuilder;
RuntimeConfigStore mConfigStore;
ShaderPackageCatalog mShaderCatalog;
LayerStackStore mLayerStack;
CommittedLiveState mCommittedLiveState;
HealthTelemetry mHealthTelemetry;
mutable std::mutex mMutex;
bool mReloadRequested;