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

adjustments to control and stack saving
All checks were successful
CI / React UI Build (push) Successful in 11s
Details
CI / Native Windows Build And Tests (push) Successful in 2m28s
Details
CI / Windows Release Package (push) Successful in 2m44s
Details

Browse Source
This commit is contained in:
Aiden
2026-05-10 22:10:54 +10:00
parent 46129a6044
commit c8a4bd4c7b
10 changed files with 539 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.cpp
View File

@@ -376,8 +376,9 @@ bool OpenGLComposite::Stop()
return true;
}
bool OpenGLComposite::ReloadShader()
bool OpenGLComposite::ReloadShader(bool preserveFeedbackState)
{
mPreserveFeedbackOnNextShaderBuild = preserveFeedbackState;
if (mRuntimeHost)
{
mRuntimeHost->SetCompileStatus(true, "Shader rebuild queued.");
@@ -744,6 +745,7 @@ bool OpenGLComposite::ProcessRuntimePollResults()
{
mRuntimeHost->SetCompileStatus(false, compilerErrorMessage);
mUseCommittedLayerStates = true;
mPreserveFeedbackOnNextShaderBuild = false;
broadcastRuntimeState();
return false;
}
@@ -751,12 +753,15 @@ bool OpenGLComposite::ProcessRuntimePollResults()
mUseCommittedLayerStates = false;
mCachedLayerRenderStates = mShaderPrograms->CommittedLayerStates();
mShaderPrograms->ResetTemporalHistoryState();
mShaderPrograms->ResetShaderFeedbackState();
if (!mPreserveFeedbackOnNextShaderBuild)
mShaderPrograms->ResetShaderFeedbackState();
mPreserveFeedbackOnNextShaderBuild = false;
broadcastRuntimeState();
return true;
}
mRuntimeHost->SetCompileStatus(true, "Shader rebuild queued.");
mPreserveFeedbackOnNextShaderBuild = false;
RequestShaderBuild();
broadcastRuntimeState();
return true;

3
apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.h
View File

@@ -44,7 +44,7 @@ public:
bool InitVideoIO();
bool Start();
bool Stop();
bool ReloadShader();
bool ReloadShader(bool preserveFeedbackState = false);
std::string GetRuntimeStateJson() const;
bool AddLayer(const std::string& shaderId, std::string& error);
bool RemoveLayer(const std::string& layerId, std::string& error);
@@ -110,6 +110,7 @@ private:
std::atomic<bool> mUseCommittedLayerStates;
std::atomic<bool> mScreenshotRequested;
std::chrono::steady_clock::time_point mLastPreviewPresentTime;
bool mPreserveFeedbackOnNextShaderBuild = false;
bool InitOpenGLState();
void renderEffect();

8
apps/LoopThroughWithOpenGLCompositing/gl/OpenGLCompositeRuntimeControls.cpp
View File

@@ -41,7 +41,7 @@ bool OpenGLComposite::AddLayer(const std::string& shaderId, std::string& error)
if (!mRuntimeHost->AddLayer(shaderId, error))
return false;
ReloadShader();
ReloadShader(true);
broadcastRuntimeState();
return true;
}
@@ -51,7 +51,7 @@ bool OpenGLComposite::RemoveLayer(const std::string& layerId, std::string& error
if (!mRuntimeHost->RemoveLayer(layerId, error))
return false;
ReloadShader();
ReloadShader(true);
broadcastRuntimeState();
return true;
}
@@ -61,7 +61,7 @@ bool OpenGLComposite::MoveLayer(const std::string& layerId, int direction, std::
if (!mRuntimeHost->MoveLayer(layerId, direction, error))
return false;
ReloadShader();
ReloadShader(true);
broadcastRuntimeState();
return true;
}
@@ -71,7 +71,7 @@ bool OpenGLComposite::MoveLayerToIndex(const std::string& layerId, std::size_t t
if (!mRuntimeHost->MoveLayerToIndex(layerId, targetIndex, error))
return false;
ReloadShader();
ReloadShader(true);
broadcastRuntimeState();
return true;
}