scope: ensure texture is updated from channel count too

Fixes #1610
This commit is contained in:
itsmattkc
2021-05-07 16:26:02 +10:00
parent f3c3b2eecf
commit 4b58d55d90
2 changed files with 3 additions and 5 deletions
+2 -1
View File
@@ -163,7 +163,8 @@ bool VideoParams::operator==(const VideoParams &rhs) const
&& time_base() == rhs.time_base()
&& format() == rhs.format()
&& pixel_aspect_ratio() == rhs.pixel_aspect_ratio()
&& divider() == rhs.divider();
&& divider() == rhs.divider()
&& channel_count() == rhs.channel_count();
}
bool VideoParams::operator!=(const VideoParams &rhs) const
+1 -4
View File
@@ -67,10 +67,7 @@ void ScopeBase::UploadTextureFromBuffer()
if (buffer_) {
makeCurrent();
if (!texture_
|| texture_->width() != buffer_->width()
|| texture_->height() != buffer_->height()
|| texture_->format() != buffer_->format()) {
if (!texture_ || texture_->params() != buffer_->video_params()) {
texture_ = nullptr;
managed_tex_ = nullptr;