6775ff2422
- Update to version 9.0.1:
* Drop obsolete patches:
+ bundled_exodusii_add_missing_libpthread.patch
+ vtk-parallelgeometry-dependency.patch
+ vtk-qt-5.15-include-QPainterPath.patch
- Explicitly enable module RenderingContextOpenGL2 required for PCL
- Conditionally add pugixml-devel Requires in devel package
- Make devel package installable even when built without Java
- Remove CAPITALIZATION from comments
- Drop obsolete TK build dependency
- Drop unused wget build dependency
- Wrap devel-doc generation in bcond (keep defaulted to off), and
drop the essentially empty package when disabled.
- Fix build on ARM/Qt GLES (boo#1172723):
* set VTK_OPENGL_USE_GLES
* Add 0001-clean-up-some-old-opengl-es-stuff.patch
* Add 0001-Remove-duplicate-check-for-QOpenGLFunctions_3_2_Core.patch
* Rebase 0001-Allow-compilation-on-GLES-platforms.patch
* Add 0001-Replace-last-glDrawBuffer-call-with-glDrawBuffers-1.patch
* Add 0001-Use-2D-textures-for-1D-texture-emulation-on-GLES.patch
* Add 0001-Add-missing-guard-required-for-GLES-to-disable-stere.patch
* Add 0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch
* Add 0002-Use-GL_DRAW_BUFFER0-instead-of-GL_DRAW_BUFFER-for-GL.patch
* Add 0001-GL_POINT_SPRITE-is-only-available-for-Compatibility-.patch
* Add 0002-Guard-GL_LINE_SMOOTH-for-GLES.patch
* Add 0001-Guard-glPointSize-with-GL_ES_VERSION_3_0.patch
- Add 0001-Fix-PyVTKAddFile_-function-signature-mismatch.patch
- Add 0001-Replace-invalid-GL_LINE-with-GL_LINES-for-glDrawArra.patch
OBS-URL: https://build.opensuse.org/request/show/821682
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=164
97 lines
3.8 KiB
Diff
97 lines
3.8 KiB
Diff
From 6cc902225a0c4fe8567071ce6518d5861218ca6a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Tue, 9 Jun 2020 17:34:39 +0200
|
|
Subject: [PATCH 1/3] Remove duplicate check for QOpenGLFunctions_3_2_Core*
|
|
|
|
The return value is already checked in QVTKRenderWindowAdapter::blit(),
|
|
no need to do it twice.
|
|
---
|
|
GUISupport/Qt/QVTKOpenGLNativeWidget.cxx | 12 +++------
|
|
GUISupport/Qt/QVTKOpenGLWindow.cxx | 32 ++++++++++--------------
|
|
2 files changed, 16 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx b/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx
|
|
index 9f058c7141..054079793a 100644
|
|
--- a/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx
|
|
+++ b/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx
|
|
@@ -19,7 +19,6 @@
|
|
#include <QOpenGLContext>
|
|
#include <QOpenGLFramebufferObject>
|
|
#include <QOpenGLFunctions>
|
|
-#include <QOpenGLFunctions_3_2_Core>
|
|
#include <QOpenGLTexture>
|
|
#include <QPointer>
|
|
#include <QScopedValueRollback>
|
|
@@ -237,14 +236,9 @@ void QVTKOpenGLNativeWidget::paintGL()
|
|
// before proceeding with blit-ing.
|
|
this->makeCurrent();
|
|
|
|
- QOpenGLFunctions_3_2_Core* f =
|
|
- QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_3_2_Core>();
|
|
- if (f)
|
|
- {
|
|
- const QSize deviceSize = this->size() * this->devicePixelRatioF();
|
|
- this->RenderWindowAdapter->blit(
|
|
- this->defaultFramebufferObject(), GL_COLOR_ATTACHMENT0, QRect(QPoint(0, 0), deviceSize));
|
|
- }
|
|
+ const QSize deviceSize = this->size() * this->devicePixelRatioF();
|
|
+ this->RenderWindowAdapter->blit(
|
|
+ this->defaultFramebufferObject(), GL_COLOR_ATTACHMENT0, QRect(QPoint(0, 0), deviceSize));
|
|
}
|
|
else
|
|
{
|
|
diff --git a/GUISupport/Qt/QVTKOpenGLWindow.cxx b/GUISupport/Qt/QVTKOpenGLWindow.cxx
|
|
index 8311ac24a8..9c97121db9 100644
|
|
--- a/GUISupport/Qt/QVTKOpenGLWindow.cxx
|
|
+++ b/GUISupport/Qt/QVTKOpenGLWindow.cxx
|
|
@@ -19,7 +19,6 @@
|
|
#include <QOpenGLContext>
|
|
#include <QOpenGLFramebufferObject>
|
|
#include <QOpenGLFunctions>
|
|
-#include <QOpenGLFunctions_3_2_Core>
|
|
#include <QOpenGLTexture>
|
|
#include <QPointer>
|
|
#include <QScopedValueRollback>
|
|
@@ -230,25 +229,20 @@ void QVTKOpenGLWindow::paintGL()
|
|
// before proceeding with blit-ing.
|
|
this->makeCurrent();
|
|
|
|
- QOpenGLFunctions_3_2_Core* f =
|
|
- QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_3_2_Core>();
|
|
- if (f)
|
|
+ const QSize deviceSize = this->size() * this->devicePixelRatioF();
|
|
+ const auto fmt = this->context()->format();
|
|
+ if (fmt.stereo() && this->RenderWindow->GetStereoRender() &&
|
|
+ this->RenderWindow->GetStereoType() == VTK_STEREO_CRYSTAL_EYES)
|
|
{
|
|
- const QSize deviceSize = this->size() * this->devicePixelRatioF();
|
|
- const auto fmt = this->context()->format();
|
|
- if (fmt.stereo() && this->RenderWindow->GetStereoRender() &&
|
|
- this->RenderWindow->GetStereoType() == VTK_STEREO_CRYSTAL_EYES)
|
|
- {
|
|
- this->RenderWindowAdapter->blitLeftEye(
|
|
- this->defaultFramebufferObject(), GL_BACK_LEFT, QRect(QPoint(0, 0), deviceSize));
|
|
- this->RenderWindowAdapter->blitRightEye(
|
|
- this->defaultFramebufferObject(), GL_BACK_RIGHT, QRect(QPoint(0, 0), deviceSize));
|
|
- }
|
|
- else
|
|
- {
|
|
- this->RenderWindowAdapter->blit(
|
|
- this->defaultFramebufferObject(), GL_BACK, QRect(QPoint(0, 0), deviceSize));
|
|
- }
|
|
+ this->RenderWindowAdapter->blitLeftEye(
|
|
+ this->defaultFramebufferObject(), GL_BACK_LEFT, QRect(QPoint(0, 0), deviceSize));
|
|
+ this->RenderWindowAdapter->blitRightEye(
|
|
+ this->defaultFramebufferObject(), GL_BACK_RIGHT, QRect(QPoint(0, 0), deviceSize));
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ this->RenderWindowAdapter->blit(
|
|
+ this->defaultFramebufferObject(), GL_BACK, QRect(QPoint(0, 0), deviceSize));
|
|
}
|
|
}
|
|
else
|
|
--
|
|
2.27.0
|
|
|