Mike-Solar
8d3bde5a50
The Waveform, Vectorscope and Histogram panels were black when running on the Vulkan / backend-neutral render path because ScopeBase::OnPaint() returned early with a TODO. The viewer emits GPU textures that live in the viewer's own renderer; on Vulkan each ManagedDisplayWidget has a separate device, so those textures cannot be sampled directly. Fix by: - Adding a backend-neutral branch in ScopeBase::OnPaint() that downloads the reference texture (cross-renderer if needed), color-manages it into a U8 offscreen texture, downloads it to a QImage, and draws via QPainter. - Adding a pure virtual DrawScopeSoftware() to ScopeBase and implementing it for WaveformScope, VectorscopeScope and HistogramScope. - Fixing the managed_tex_up_to_date_ flag that was never set to true in the OpenGL path, which caused the color-managed scope texture to be recreated on every paint. All gtest suites pass.
90 lines
2.1 KiB
C++
90 lines
2.1 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
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 <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#ifndef SCOPEBASE_H
|
|
#define SCOPEBASE_H
|
|
|
|
#include "codec/frame.h"
|
|
#include "render/colorprocessor.h"
|
|
#include "widget/manageddisplay/manageddisplay.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
class ScopeBase : public ManagedDisplayWidget {
|
|
public:
|
|
ScopeBase(QWidget *parent = nullptr);
|
|
|
|
MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR(ScopeBase)
|
|
|
|
public slots:
|
|
void SetBuffer(TexturePtr frame);
|
|
|
|
protected slots:
|
|
virtual void OnInit() override;
|
|
|
|
virtual void OnPaint() override;
|
|
|
|
virtual void OnDestroy() override;
|
|
|
|
protected:
|
|
virtual void showEvent(QShowEvent *e) override;
|
|
|
|
virtual ShaderCode GenerateShaderCode() = 0;
|
|
|
|
/**
|
|
* @brief GPU-accelerated draw function used on OpenGL backends.
|
|
*
|
|
* Override this if your sub-class scope needs extra drawing.
|
|
*/
|
|
virtual void DrawScope(TexturePtr managed_tex, QVariant pipeline);
|
|
|
|
/**
|
|
* @brief Software draw function used on backend-neutral paths (e.g. Vulkan).
|
|
*
|
|
* Implementations receive an 8-bit sRGB/display-ready image and should draw
|
|
* the scope visualization with QPainter.
|
|
*/
|
|
virtual void DrawScopeSoftware(QPainter &p, const QImage &image) = 0;
|
|
|
|
private:
|
|
void UpdateSoftwareImage();
|
|
|
|
QVariant pipeline_;
|
|
|
|
TexturePtr texture_;
|
|
|
|
TexturePtr managed_tex_;
|
|
|
|
bool managed_tex_up_to_date_;
|
|
|
|
TexturePtr software_tex_;
|
|
QByteArray software_buffer_;
|
|
QImage software_image_;
|
|
bool software_image_up_to_date_;
|
|
|
|
TexturePtr local_texture_;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // SCOPEBASE_H
|