diff --git a/app/node/color/CMakeLists.txt b/app/node/color/CMakeLists.txt
index ca29ad8db..43b005216 100644
--- a/app/node/color/CMakeLists.txt
+++ b/app/node/color/CMakeLists.txt
@@ -16,7 +16,6 @@
add_subdirectory(colormanager)
add_subdirectory(displaytransform)
-add_subdirectory(ociobase)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
diff --git a/app/node/color/displaytransform/displaytransform.cpp b/app/node/color/displaytransform/displaytransform.cpp
index 66f7ebb82..10e9caac7 100644
--- a/app/node/color/displaytransform/displaytransform.cpp
+++ b/app/node/color/displaytransform/displaytransform.cpp
@@ -107,8 +107,11 @@ void DisplayTransformNode::Value(const NodeValueRow &value, const NodeGlobals &g
{
ShaderJob job;
job.InsertValue(value);
+ job.SetUseOCIO(true);
+ job.SetShaderDesc(shader_desc_);
+ job.SetColorProcessor(reference_to_display_);
- renderer()->ShaderJobInsertTextures(reference_to_display_, &job, shader_desc_);
+ //renderer()->ShaderJobInsertTextures(reference_to_display_, &job, shader_desc_);
// If there's no texture, no need to run an operation
if (!job.GetValue(kTextureInput).data().isNull()) {
diff --git a/app/node/color/displaytransform/displaytransform.h b/app/node/color/displaytransform/displaytransform.h
index 485bd0171..074677b75 100644
--- a/app/node/color/displaytransform/displaytransform.h
+++ b/app/node/color/displaytransform/displaytransform.h
@@ -16,10 +16,11 @@
#ifndef DISPLAYTRANSFORMNODE_H
#define DISPLAYTRANSFORMNODE_H
-#include "node/color/ociobase/ociobase.h"
+#include "node/node.h"
+#include "render/colorprocessor.h"
namespace olive {
-class DisplayTransformNode : public OCIONodeBase {
+class DisplayTransformNode : public Node {
Q_OBJECT
public:
DisplayTransformNode();
@@ -41,6 +42,9 @@ class DisplayTransformNode : public OCIONodeBase {
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const override;
+ ColorProcessorPtr GetColorProcessor() { return reference_to_display_; };
+ OCIO::GpuShaderDescRcPtr GetGPUShaderDesc() { return shader_desc_; };
+
static const QString kTextureInput;
static const QString kDirectionInput;
diff --git a/app/node/color/ociobase/CMakeLists.txt b/app/node/color/ociobase/CMakeLists.txt
deleted file mode 100644
index fa00411a4..000000000
--- a/app/node/color/ociobase/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Olive - Non-Linear Video Editor
-# Copyright (C) 2021 Olive Team
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-set(OLIVE_SOURCES
- ${OLIVE_SOURCES}
- node/color/ociobase/ociobase.cpp
- node/color/ociobase/ociobase.h
- PARENT_SCOPE
-)
diff --git a/app/node/color/ociobase/ociobase.cpp b/app/node/color/ociobase/ociobase.cpp
deleted file mode 100644
index ebe7c9790..000000000
--- a/app/node/color/ociobase/ociobase.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/***
-
- Olive - Non-Linear Video Editor
- Copyright (C) 2021 Olive Team
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-***/
-
-#include "ociobase.h"
-
-#include "render/opengl/openglrenderer.h"
-
-namespace olive {
-
-OCIONodeBase::OCIONodeBase()
-{
- if (true){//RenderManager::instance()->backend() == RenderManager::kOpenGL) {
- // Create OpenGL renderer
- attached_renderer_ = new OpenGLRenderer(this);
- attached_renderer_->Init();
- attached_renderer_->PostInit();
- }
-}
-
-}
diff --git a/app/node/color/ociobase/ociobase.h b/app/node/color/ociobase/ociobase.h
deleted file mode 100644
index e74a97cb0..000000000
--- a/app/node/color/ociobase/ociobase.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***
-
- Olive - Non-Linear Video Editor
- Copyright (C) 2021 Olive Team
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-***/
-
-#ifndef OCIOBASE_H
-#define OCIOBASE_H
-
-#include "node/node.h"
-#include "render/rendermanager.h"
-
-namespace olive {
-
-class OCIONodeBase : public Node
-{
-public:
- OCIONodeBase();
-
- NODE_DEFAULT_DESTRUCTOR(OCIONodeBase);
-
-protected:
- Renderer* renderer() const
- {
- return attached_renderer_;
- }
-
- /**
- * @brief Renderer abstraction
- */
- Renderer* attached_renderer_;
-};
-
-
-} // olive
-
-#endif // OCIOBASE_H
diff --git a/app/node/hashtraverser.cpp b/app/node/hashtraverser.cpp
index c4b7fa9a5..155842242 100644
--- a/app/node/hashtraverser.cpp
+++ b/app/node/hashtraverser.cpp
@@ -86,7 +86,7 @@ SampleBufferPtr HashTraverser::ProcessAudioFootage(const FootageJob &stream, con
return buf;
}
-TexturePtr HashTraverser::ProcessShader(const Node *node, const TimeRange &range, const ShaderJob &job)
+TexturePtr HashTraverser::ProcessShader(const Node *node, const TimeRange &range, ShaderJob &job)
{
HashGenerateJob(node, &job);
diff --git a/app/node/hashtraverser.h b/app/node/hashtraverser.h
index 4eb0eb5cd..39957c9ed 100644
--- a/app/node/hashtraverser.h
+++ b/app/node/hashtraverser.h
@@ -37,7 +37,7 @@ protected:
virtual SampleBufferPtr ProcessAudioFootage(const FootageJob &stream, const TimeRange &input_time) override;
- virtual TexturePtr ProcessShader(const Node *node, const TimeRange &range, const ShaderJob& job) override;
+ virtual TexturePtr ProcessShader(const Node *node, const TimeRange &range, ShaderJob& job) override;
virtual SampleBufferPtr ProcessSamples(const Node *node, const TimeRange &range, const SampleJob &job) override;
diff --git a/app/node/traverser.cpp b/app/node/traverser.cpp
index 754995a5d..d32941253 100644
--- a/app/node/traverser.cpp
+++ b/app/node/traverser.cpp
@@ -292,7 +292,7 @@ SampleBufferPtr NodeTraverser::ProcessAudioFootage(const FootageJob& stream, con
return SampleBuffer::Create();
}
-TexturePtr NodeTraverser::ProcessShader(const Node *node, const TimeRange &range, const ShaderJob &job)
+TexturePtr NodeTraverser::ProcessShader(const Node *node, const TimeRange &range, ShaderJob &job)
{
Q_UNUSED(node)
Q_UNUSED(range)
diff --git a/app/node/traverser.h b/app/node/traverser.h
index 839c8561b..3af7a300c 100644
--- a/app/node/traverser.h
+++ b/app/node/traverser.h
@@ -76,7 +76,7 @@ protected:
virtual SampleBufferPtr ProcessAudioFootage(const FootageJob &stream, const TimeRange &input_time);
- virtual TexturePtr ProcessShader(const Node *node, const TimeRange &range, const ShaderJob& job);
+ virtual TexturePtr ProcessShader(const Node *node, const TimeRange &range, ShaderJob& job);
virtual SampleBufferPtr ProcessSamples(const Node *node, const TimeRange &range, const SampleJob &job);
diff --git a/app/render/job/shaderjob.h b/app/render/job/shaderjob.h
index 3bbbac19d..ba5ad1427 100644
--- a/app/render/job/shaderjob.h
+++ b/app/render/job/shaderjob.h
@@ -24,6 +24,7 @@
#include
#include "generatejob.h"
+#include "render/colorprocessor.h"
#include "render/texture.h"
namespace olive {
@@ -34,6 +35,7 @@ public:
{
iterations_ = 1;
iterative_input_ = nullptr;
+ use_ocio_ = false;
}
const QString& GetShaderID() const
@@ -87,6 +89,38 @@ public:
interpolation_.insert(id, interp);
}
+ bool UseOCIO() const
+ {
+ return use_ocio_;
+ }
+
+ void SetUseOCIO(bool use_ocio)
+ {
+ use_ocio_ = use_ocio;
+ }
+
+ ColorProcessorPtr ColorProcessor()
+ {
+ return color_processor_;
+ }
+
+ void SetColorProcessor(ColorProcessorPtr processor)
+ {
+ color_processor_ = processor;
+ }
+
+ OCIO::GpuShaderDescRcPtr ShaderDesc()
+ {
+ return shader_desc_;
+ }
+
+ void SetShaderDesc(OCIO::GpuShaderDescRcPtr shader_desc)
+ {
+ shader_desc_ = shader_desc;
+ }
+
+
+
private:
QString shader_id_;
@@ -96,6 +130,11 @@ private:
QHash interpolation_;
+ bool use_ocio_;
+
+ ColorProcessorPtr color_processor_;
+ OCIO::GpuShaderDescRcPtr shader_desc_;
+
};
}
diff --git a/app/render/renderprocessor.cpp b/app/render/renderprocessor.cpp
index 01bd95518..015070d0b 100644
--- a/app/render/renderprocessor.cpp
+++ b/app/render/renderprocessor.cpp
@@ -27,6 +27,7 @@
#include "node/block/clip/clip.h"
#include "node/block/transition/transition.h"
+#include "node/color/displaytransform/displaytransform.h"
#include "node/project/project.h"
#include "rendermanager.h"
@@ -464,7 +465,7 @@ SampleBufferPtr RenderProcessor::ProcessAudioFootage(const FootageJob &stream, c
return super::ProcessAudioFootage(stream, input_time);
}
-TexturePtr RenderProcessor::ProcessShader(const Node *node, const TimeRange &range, const ShaderJob &job)
+TexturePtr RenderProcessor::ProcessShader(const Node *node, const TimeRange &range, ShaderJob &job)
{
Q_UNUSED(range)
@@ -475,6 +476,10 @@ TexturePtr RenderProcessor::ProcessShader(const Node *node, const TimeRange &ran
QVariant shader = shader_cache_->value(full_shader_id);
if (shader.isNull()) {
+ if (job.UseOCIO()) {
+ render_ctx_->ShaderJobInsertTextures(job.ColorProcessor(), &job, job.ShaderDesc());
+ }
+
// Since we have shader code, compile it now
shader = render_ctx_->CreateNativeShader(node->GetShaderCode(job.GetShaderID()));
diff --git a/app/render/renderprocessor.h b/app/render/renderprocessor.h
index 213b2df16..7d655a986 100644
--- a/app/render/renderprocessor.h
+++ b/app/render/renderprocessor.h
@@ -48,7 +48,7 @@ protected:
virtual SampleBufferPtr ProcessAudioFootage(const FootageJob &stream, const TimeRange &input_time) override;
- virtual TexturePtr ProcessShader(const Node *node, const TimeRange &range, const ShaderJob& job) override;
+ virtual TexturePtr ProcessShader(const Node *node, const TimeRange &range, ShaderJob& job) override;
virtual SampleBufferPtr ProcessSamples(const Node *node, const TimeRange &range, const SampleJob &job) override;
diff --git a/app/shaders/displaytransform.frag b/app/shaders/displaytransform.frag
index d547b074f..d597f47d2 100644
--- a/app/shaders/displaytransform.frag
+++ b/app/shaders/displaytransform.frag
@@ -9,5 +9,5 @@ void main() {
col = DisplayTransform(col);
- gl_FragColor - col;
+ gl_FragColor = col;
}