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
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 2b930f694c2275b892772857002724b9fdcae6c5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Thu, 16 Jul 2020 03:52:23 +0200
|
|
Subject: [PATCH 1/2] Correct GL_BACK/GL_BACK_LEFT mapping on GLES
|
|
|
|
GLES does not have LEFT/RIGHT targets for the default framebuffer, but
|
|
just GL_BACK, so there is no need to remap it. Desktop GL may have
|
|
LEFT and RIGHT attached at the simultaneously, so one of the buffers
|
|
has to be selected when querying the attributes.
|
|
---
|
|
Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
|
|
index 9bbbc2ba54..4bda9330b6 100644
|
|
--- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
|
|
+++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
|
|
@@ -719,6 +719,10 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
|
|
#ifdef GL_DRAW_BUFFER
|
|
glGetIntegerv(GL_DRAW_BUFFER, &attachment);
|
|
#endif
|
|
+#ifdef GL_ES_VERSION_3_0
|
|
+ // GLES only has the GL_BACK color
|
|
+ // attachment for the default framebuffer
|
|
+#else
|
|
// GL seems odd with its handling of left/right.
|
|
// if it says we are using GL_FRONT or GL_BACK
|
|
// then convert those to GL_FRONT_LEFT and
|
|
@@ -731,6 +735,7 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
|
|
{
|
|
attachment = GL_BACK_LEFT;
|
|
}
|
|
+#endif
|
|
|
|
// make sure we clear any errors before we start
|
|
// otherwise we may get incorrect results
|
|
--
|
|
2.27.0
|
|
|