oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderbackend: moved bulk of hashing code to static function so more code has access to it

Browse Source
This commit is contained in:
itsmattkc
2020-06-09 02:36:11 +10:00
parent 2fc1ccebf7
commit e10b1462ff
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/renderbackend.cpp
+17 -11
View File
@@ -119,17 +119,9 @@ QFuture<QList<QByteArray> > RenderBackend::Hash(const QList<rational> &times)
QList<QByteArray> hashes;
foreach (const rational& t, times) {
QCryptographicHash hasher(QCryptographicHash::Sha1);
// Embed video parameters into this hash
hasher.addData(reinterpret_cast<const char*>(&video_params_.effective_width()), sizeof(int));
hasher.addData(reinterpret_cast<const char*>(&video_params_.effective_height()), sizeof(int));
hasher.addData(reinterpret_cast<const char*>(&video_params_.format()), sizeof(PixelFormat::Format));
hasher.addData(reinterpret_cast<const char*>(&render_mode_), sizeof(RenderMode::Mode));
copied_viewer_node_->texture_input()->get_connected_node()->Hash(hasher, t);
hashes.append(hasher.result());
hashes.append(HashNode(copied_viewer_node_->texture_input()->get_connected_node(),
video_params_,
t));
}
return hashes;
@@ -347,6 +339,20 @@ void RenderBackend::ProcessUpdateQueue()
CopyNodeInputValue(viewer_node_->samples_input());
}
QByteArray RenderBackend::HashNode(const Node *n, const VideoParams &params, const rational &time)
{
QCryptographicHash hasher(QCryptographicHash::Sha1);
// Embed video parameters into this hash
hasher.addData(reinterpret_cast<const char*>(&params.effective_width()), sizeof(int));
hasher.addData(reinterpret_cast<const char*>(&params.effective_height()), sizeof(int));
hasher.addData(reinterpret_cast<const char*>(&params.format()), sizeof(PixelFormat::Format));
n->Hash(hasher, time);
return hasher.result();
}
void RenderBackend::WorkerFinished()
{
RenderWorker* worker = static_cast<RenderWorker*>(sender());