fixed bug where several frames being cached at the same time would lead to most

of them returning blank
This commit is contained in:
itsmattkc
2019-12-06 13:32:02 +11:00
parent b8b9ae878b
commit 927e2252f3
2 changed files with 8 additions and 9 deletions
+7 -8
View File
@@ -31,7 +31,7 @@ bool OpenGLBackend::InitInternal()
// Initiate one thread per CPU core // Initiate one thread per CPU core
for (int i=0;i<threads().size();i++) { for (int i=0;i<threads().size();i++) {
// Create one processor object for each thread // Create one processor object for each thread
OpenGLWorker* processor = new OpenGLWorker(share_ctx, &shader_cache_, decoder_cache(), frame_cache()); OpenGLWorker* processor = new OpenGLWorker(share_ctx, &shader_cache_, decoder_cache(), color_cache(), frame_cache());
processor->SetParameters(params()); processor->SetParameters(params());
processors_.append(processor); processors_.append(processor);
} }
@@ -135,8 +135,6 @@ bool OpenGLBackend::TimeIsCached(const TimeRange &time)
void OpenGLBackend::ThreadCompletedFrame(NodeDependency path, QByteArray hash, NodeValueTable table) void OpenGLBackend::ThreadCompletedFrame(NodeDependency path, QByteArray hash, NodeValueTable table)
{ {
caching_ = false;
QVariant value = table.Get(NodeParam::kTexture); QVariant value = table.Get(NodeParam::kTexture);
OpenGLTexturePtr texture = value.value<OpenGLTexturePtr>(); OpenGLTexturePtr texture = value.value<OpenGLTexturePtr>();
@@ -168,7 +166,7 @@ void OpenGLBackend::ThreadCompletedFrame(NodeDependency path, QByteArray hash, N
emit CachedFrameReady(path.in(), value); emit CachedFrameReady(path.in(), value);
} }
CacheNext(); CompletedFrame();
} }
void OpenGLBackend::ThreadCompletedDownload(NodeDependency dep, QByteArray hash) void OpenGLBackend::ThreadCompletedDownload(NodeDependency dep, QByteArray hash)
@@ -178,15 +176,16 @@ void OpenGLBackend::ThreadCompletedDownload(NodeDependency dep, QByteArray hash)
emit CachedTimeReady(dep.in()); emit CachedTimeReady(dep.in());
} }
void OpenGLBackend::ThreadSkippedFrame() void OpenGLBackend::ThreadSkippedFrame(NodeDependency dep, QByteArray hash)
{ {
caching_ = false; frame_cache()->SetHash(dep.in(), hash);
CacheNext();
CompletedFrame();
} }
void OpenGLBackend::ThreadHashAlreadyExists(NodeDependency dep, QByteArray hash) void OpenGLBackend::ThreadHashAlreadyExists(NodeDependency dep, QByteArray hash)
{ {
ThreadCompletedDownload(dep, hash); ThreadCompletedDownload(dep, hash);
ThreadSkippedFrame(); CompletedFrame();
} }
+1 -1
View File
@@ -37,7 +37,7 @@ private:
private slots: private slots:
void ThreadCompletedFrame(NodeDependency path, QByteArray hash, NodeValueTable table); void ThreadCompletedFrame(NodeDependency path, QByteArray hash, NodeValueTable table);
void ThreadCompletedDownload(NodeDependency dep, QByteArray hash); void ThreadCompletedDownload(NodeDependency dep, QByteArray hash);
void ThreadSkippedFrame(); void ThreadSkippedFrame(NodeDependency dep, QByteArray hash);
void ThreadHashAlreadyExists(NodeDependency dep, QByteArray hash); void ThreadHashAlreadyExists(NodeDependency dep, QByteArray hash);
}; };