If you run into new OpenGL issues, this is likely the commit that caused it. I've tested this on as many systems as I have access to (including AMD, Apple, Intel, and NVIDIA GPUs with a mixture of Windows, Linux, and macOS) and it appears to work fine, however we all know how unpredictable GPUs can be. This should help increase GPU performance and compatibility. Squashed commit of the following: commit fa3c0ac7c469aebe2941a803736bdc06cdd5a2d8 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 13:17:44 2021 +1000 viewer: updated pixel sampling for shared contexts commit 9334261da235f09cb67b193c5bb6169abd7a95f7 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 13:12:39 2021 +1000 pixelsampler: show color preview box commit dacd9be6971c5c0312ae45c8db349d47910a80dd Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 12:43:32 2021 +1000 renderer: interlace on GPU commit 074cea06cb87e9fdc4e8ea6b09587be6df296057 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 12:43:14 2021 +1000 renderer: added texture clear option commit 5d4f86b4cf1b1dcd3fb8e8c854ffa7f6fb8ca346 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 12:42:12 2021 +1000 renderer: updated scopes for shared textures commit 6fad96358d189874cf45f7887b7e13cc2b1603c4 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 11:42:05 2021 +1000 opengl: fixed edge case commit 1a19ffb53703ac6f30ed210f6d8eb5fc4b7b0f2d Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 10:56:13 2021 +1000 opengl: fix deinterlace shader commit 085961aa39cca90ebf51b919a78ef07a4882f0e1 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 10:08:40 2021 +1000 opengl: downgrade to ES 2.0 With half-float/float/3D extensions, this should be doable commit ea1ab45cbcf5e017dfd0d8f28b231ff3255dfe92 Author: itsmattkc <itsmattkc@gmail.com> Date: Thu May 27 10:06:59 2021 +1000 renderer: fixed mutex deadlock commit ecc2f08b16f03421870c5b61625ecd26f2f96582 Author: itsmattkc <itsmattkc@gmail.com> Date: Wed May 26 21:28:13 2021 +1000 opengl: fixed shared contexts commit 261c689ea8089463155cf11b9ab15aa3f879f439 Merge: bfd4338a91c88b1cAuthor: itsmattkc <itsmattkc@gmail.com> Date: Wed May 26 19:52:00 2021 +1000 Merge branch 'master' into shared-contexts commit bfd4338aaa3b09b6fbb7717c637face8d5490721 Author: itsmattkc <itsmattkc@gmail.com> Date: Wed May 26 18:52:38 2021 +1000 viewer: remove debug line commit 45868d8a396181bf81c24b92a1ac5ce9ffed3426 Merge: 642f8e9dd0bd5e21Author: itsmattkc <itsmattkc@gmail.com> Date: Wed May 26 17:21:48 2021 +1000 Merge branch 'master' into shared-contexts commit 642f8e9df7d7d1a9ed4202d428f4d968ff668552 Merge: 861e5b894de0a727Author: itsmattkc <itsmattkc@gmail.com> Date: Wed May 26 17:01:38 2021 +1000 Merge branch 'master' of https://github.com/olive-editor/olive into shared-contexts commit 861e5b89a38c281897dc44b20e3587d39c4f808c Merge: 472598a7ef31c3fbAuthor: itsmattkc <itsmattkc@gmail.com> Date: Wed May 26 14:28:21 2021 +1000 Merge branch 'master' into shared-contexts commit 472598a740a095aa43a4aad5680dd5abcf453a4c Author: itsmattkc <itsmattkc@gmail.com> Date: Fri May 14 16:29:35 2021 +1000 attempt at sharing contexts
109 lines
2.6 KiB
C++
109 lines
2.6 KiB
C++
/***
|
|
|
|
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 <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#include "scope.h"
|
|
|
|
#include <QVBoxLayout>
|
|
|
|
#include "panel/viewer/viewer.h"
|
|
|
|
namespace olive {
|
|
|
|
ScopePanel::ScopePanel(QWidget* parent) :
|
|
PanelWidget(QStringLiteral("ScopePanel"), parent)
|
|
{
|
|
QWidget* central = new QWidget();
|
|
setWidget(central);
|
|
|
|
QVBoxLayout* layout = new QVBoxLayout(central);
|
|
|
|
QHBoxLayout* toolbar_layout = new QHBoxLayout();
|
|
toolbar_layout->setMargin(0);
|
|
|
|
scope_type_combobox_ = new QComboBox();
|
|
|
|
for (int i=0;i<ScopePanel::kTypeCount;i++) {
|
|
// These strings get filled in later in Retranslate()
|
|
scope_type_combobox_->addItem(QString());
|
|
}
|
|
|
|
toolbar_layout->addWidget(scope_type_combobox_);
|
|
toolbar_layout->addStretch();
|
|
|
|
layout->addLayout(toolbar_layout);
|
|
|
|
stack_ = new QStackedWidget();
|
|
layout->addWidget(stack_);
|
|
|
|
// Create waveform view
|
|
waveform_view_ = new WaveformScope();
|
|
stack_->addWidget(waveform_view_);
|
|
|
|
// Create histogram
|
|
histogram_ = new HistogramScope();
|
|
stack_->addWidget(histogram_);
|
|
|
|
connect(scope_type_combobox_, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), stack_, &QStackedWidget::setCurrentIndex);
|
|
|
|
Retranslate();
|
|
}
|
|
|
|
void ScopePanel::SetType(ScopePanel::Type t)
|
|
{
|
|
scope_type_combobox_->setCurrentIndex(t);
|
|
}
|
|
|
|
QString ScopePanel::TypeToName(ScopePanel::Type t)
|
|
{
|
|
switch (t) {
|
|
case kTypeWaveform:
|
|
return tr("Waveform");
|
|
case kTypeHistogram:
|
|
return tr("Histogram");
|
|
case kTypeCount:
|
|
break;
|
|
}
|
|
|
|
return QString();
|
|
}
|
|
|
|
void ScopePanel::SetReferenceBuffer(TexturePtr frame)
|
|
{
|
|
histogram_->SetBuffer(frame);
|
|
waveform_view_->SetBuffer(frame);
|
|
}
|
|
|
|
void ScopePanel::SetColorManager(ColorManager *manager)
|
|
{
|
|
histogram_->ConnectColorManager(manager);
|
|
waveform_view_->ConnectColorManager(manager);
|
|
}
|
|
|
|
void ScopePanel::Retranslate()
|
|
{
|
|
SetTitle(tr("Scope"));
|
|
|
|
for (int i=0;i<ScopePanel::kTypeCount;i++) {
|
|
scope_type_combobox_->setItemText(i, TypeToName(static_cast<Type>(i)));
|
|
}
|
|
}
|
|
|
|
}
|