blob: 0f2bd047929a9fde6814c1da52298ba51b0bf480 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Update OpenGL and VTK headers for VTK 9 compatibility.
VTK 9 removed several deprecated headers and changed OpenGL handling:
- Removed vtk_glew.h and vtkOpenGL.h (no longer needed)
- Added vtkOpenGLState.h and vtk_glad.h for modern OpenGL
- Replaced vtkgl::BlendEquationEXT with standard glBlendEquation
(OpenGL 3.2+ has blend equations built-in, no extensions needed)
--- vv/vvBlendImageActor.cxx.orig 2025-04-17 12:54:38 UTC
+++ vv/vvBlendImageActor.cxx
@@ -3,7 +3,7 @@ - University of LYON http://www.universit
Authors belong to:
- University of LYON http://www.universite-lyon.fr/
-- L�on B�rard cancer center http://www.centreleonberard.fr
+- L�on B�rard cancer center http://www.centreleonberard.fr
- CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
This software is distributed WITHOUT ANY WARRANTY; without even
@@ -17,11 +17,11 @@ - CeCILL-B http://www.cecill.info/licences/Licence_C
===========================================================================**/
#include "vvBlendImageActor.h"
-#include <vtk_glew.h>
#include <vtkOpenGLRenderWindow.h>
#include <vtkOpenGLRenderer.h>
-#include <vtkOpenGL.h>
#include <vtkObjectFactory.h>
+#include <vtkOpenGLState.h>
+#include <vtk_glad.h>
vtkStandardNewMacro(vvBlendImageActor);
@@ -45,19 +45,14 @@ void vvBlendImageActor::Render(vtkRenderer *ren)
VTK_IMAGE_ACTOR::Render(ren);
#else
- vtkOpenGLExtensionManager *extensions = renwin->GetExtensionManager();
- if (extensions->ExtensionSupported("GL_EXT_blend_minmax")) {
- extensions->LoadExtension("GL_EXT_blend_minmax");
- vtkgl::BlendEquationEXT( vtkgl::MAX );
- }
+ // VTK 9 uses OpenGL 3.2+ which has blend equations built-in
+ glBlendEquation(GL_MAX);
//Call normal render
VTK_IMAGE_ACTOR::Render(ren);
//Move back blending to weighted sum
- if (vtkgl::BlendEquationEXT!=0) {
- vtkgl::BlendEquationEXT( vtkgl::FUNC_ADD );
- }
+ glBlendEquation(GL_FUNC_ADD);
#endif
}
|
