Skip to content

Commit 653d2dd

Browse files
MehdiChinouneMehdiChinoune
committed
vtk: update to 9.4.0
1 parent ca47683 commit 653d2dd

8 files changed

+107
-243
lines changed

‎mingw-w64-vtk/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
100-fix-build-vtkm-with-clang-19.patch
2+
101-fix-build-vtkm-with-clang-19_2.patch
3+
102-fix-build-vtkm-with-clang-19_3.patch

‎mingw-w64-vtk/002-Fix-build-with-gcc-13.patch

-12
This file was deleted.

‎mingw-w64-vtk/002-fix-build-with-anari-on-mingw.patch

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--- a/Rendering/ANARI/vtkAnariPolyDataMapperNode.cxx
2+
+++ b/Rendering/ANARI/vtkAnariPolyDataMapperNode.cxx
3+
@@ -37,6 +37,9 @@
4+
#include <memory>
5+
#include <string>
6+
#include <vector>
7+
+#include <cstdint>
8+
+#include <_bsd_types.h>
9+
+typedef uint32_t u_int32_t;
10+
11+
using uvec2 = anari::std_types::uvec2;
12+
using uvec3 = anari::std_types::uvec3;
13+
--- a/Rendering/ANARI/vtkAnariRendererNode.cxx
14+
+++ b/Rendering/ANARI/vtkAnariRendererNode.cxx
15+
@@ -33,6 +33,8 @@
16+
#include "vtkTexture.h"
17+
18+
#include <cmath>
19+
+#include <_bsd_types.h>
20+
+typedef unsigned int uint;
21+
22+
#include <anari/anari_cpp/ext/std.h>
23+

‎mingw-w64-vtk/003-fix-build-with-fmt-11.patch

+11-31
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,20 @@
1-
--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
2-
+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
1+
--- a/ThirdParty/ioss/vtkioss/Ioss_Field.C
2+
+++ b/ThirdParty/ioss/vtkioss/Ioss_Field.C
33
@@ -12,6 +12,7 @@
4-
#include <cstddef> // for nullptr
4+
#include <cstdint>
55
#include "vtk_fmt.h"
66
#include VTK_FMT(fmt/ostream.h)
77
+#include VTK_FMT(fmt/ranges.h)
8-
#include <map> // for _Rb_tree_iterator, etc
9-
#include <ostream> // for basic_ostream, etc
10-
#include <set>
11-
--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
12-
+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
13-
@@ -15,6 +15,7 @@
14-
#include <Ioss_StructuredBlock.h>
15-
#include "vtk_fmt.h"
16-
#include VTK_FMT(fmt/ostream.h)
17-
+#include VTK_FMT(fmt/ranges.h)
18-
19-
#include <cstddef> // for size_t
20-
#include <numeric>
21-
--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
22-
+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
23-
@@ -21,6 +21,7 @@
24-
#include VTK_FMT(fmt/chrono.h)
8+
#include <iostream>
9+
#include <string>
10+
#include <vector>
11+
--- a/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
12+
+++ b/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
13+
@@ -19,6 +19,7 @@
14+
#include VTK_FMT(fmt/core.h)
2515
#include VTK_FMT(fmt/format.h)
2616
#include VTK_FMT(fmt/ostream.h)
2717
+#include VTK_FMT(fmt/ranges.h)
28-
#include <fstream>
18+
#include <map>
2919
#include <sstream>
3020
#include <string>
31-
--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
32-
+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
33-
@@ -9,6 +9,7 @@
34-
#include <cstddef> // for size_t
35-
#include "vtk_fmt.h"
36-
#include VTK_FMT(fmt/ostream.h)
37-
+#include VTK_FMT(fmt/ranges.h)
38-
#include <string> // for string
39-
#include <vector> // for vector
40-

‎mingw-w64-vtk/005-opencascade-7.8.patch

-96
This file was deleted.

‎mingw-w64-vtk/007-dll-export-some-functions.patch

+33-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Common/Core/vtkAOSDataArrayTemplate.h
22
+++ b/Common/Core/vtkAOSDataArrayTemplate.h
3-
@@ -63,7 +63,7 @@
3+
@@ -75,7 +75,7 @@
44
/**
55
* Get the value at @a valueIdx. @a valueIdx assumes AOS ordering.
66
*/
@@ -9,7 +9,7 @@
99
VTK_EXPECTS(0 <= valueIdx && valueIdx < GetNumberOfValues())
1010
{
1111
return this->Buffer->GetBuffer()[valueIdx];
12-
@@ -72,7 +72,7 @@
12+
@@ -84,7 +84,7 @@
1313
/**
1414
* Set the value at @a valueIdx to @a value. @a valueIdx assumes AOS ordering.
1515
*/
@@ -18,7 +18,7 @@
1818
VTK_EXPECTS(0 <= valueIdx && valueIdx < GetNumberOfValues())
1919
{
2020
this->Buffer->GetBuffer()[valueIdx] = value;
21-
@@ -82,7 +82,7 @@
21+
@@ -94,7 +94,7 @@
2222
/**
2323
* Copy the tuple at @a tupleIdx into @a tuple.
2424
*/
@@ -27,7 +27,7 @@
2727
VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples())
2828
{
2929
const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents;
30-
@@ -95,7 +95,7 @@
30+
@@ -107,7 +107,7 @@
3131
/**
3232
* Set this array's tuple at @a tupleIdx to the values in @a tuple.
3333
*/
@@ -36,25 +36,25 @@
3636
VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples())
3737
{
3838
const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents;
39-
@@ -106,7 +106,7 @@
39+
@@ -158,7 +158,7 @@
4040
/**
4141
* Get component @a comp of the tuple at @a tupleIdx.
4242
*/
43-
- ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const VTK_EXPECTS(0 <= tupleIdx &&
44-
+ VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const VTK_EXPECTS(0 <= tupleIdx &&
45-
tupleIdx < GetNumberOfTuples()) VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
43+
- ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
44+
+ VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
45+
VTK_EXPECTS(0 <= tupleIdx && GetNumberOfComponents() * tupleIdx + comp < GetNumberOfValues())
46+
VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
4647
{
47-
return this->Buffer->GetBuffer()[this->NumberOfComponents * tupleIdx + comp];
48-
@@ -116,7 +116,7 @@
48+
@@ -169,7 +169,7 @@
4949
/**
5050
* Set component @a comp of the tuple at @a tupleIdx to @a value.
5151
*/
52-
- void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value) VTK_EXPECTS(0 <= tupleIdx &&
53-
+ VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value) VTK_EXPECTS(0 <= tupleIdx &&
54-
tupleIdx < GetNumberOfTuples()) VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
52+
- void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
53+
+ VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
54+
VTK_EXPECTS(0 <= tupleIdx && GetNumberOfComponents() * tupleIdx + comp < GetNumberOfValues())
55+
VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
5556
{
56-
const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents + comp;
57-
@@ -260,11 +260,11 @@
57+
@@ -314,11 +314,11 @@
5858
vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override;
5959
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
6060
// using Superclass::InsertTuples;
@@ -70,7 +70,7 @@
7070
this->Superclass::InsertTuplesStartingAt(dstStart, srcIds, source);
7171
--- a/Common/Core/vtkSetGet.h
7272
+++ b/Common/Core/vtkSetGet.h
73-
@@ -827,7 +827,7 @@
73+
@@ -1076,7 +1076,7 @@
7474
\
7575
public: \
7676
typedef superclass Superclass; \
@@ -79,16 +79,16 @@
7979
{ \
8080
if (!strcmp(thisClassName, type)) \
8181
{ \
82-
@@ -836,7 +836,7 @@
83-
return superclass::IsTypeOf(type); \
82+
@@ -1088,7 +1088,7 @@
83+
{ \
84+
return this->thisClass::IsTypeOf(type); \
8485
} \
85-
vtkTypeBool IsA(const char* type) override { return this->thisClass::IsTypeOf(type); } \
8686
- static thisClass* SafeDownCast(vtkObjectBase* o) \
8787
+ static VTKCOMMONCORE_EXPORT thisClass* SafeDownCast(vtkObjectBase* o) \
8888
{ \
8989
if (o && o->IsA(thisClassName)) \
9090
{ \
91-
@@ -848,7 +848,7 @@
91+
@@ -1100,7 +1100,7 @@
9292
{ \
9393
return instanceType::SafeDownCast(this->NewInstanceInternal()); \
9494
} \
@@ -99,7 +99,7 @@
9999
{ \
100100
--- a/Common/Core/vtkSOADataArrayTemplate.h
101101
+++ b/Common/Core/vtkSOADataArrayTemplate.h
102-
@@ -60,7 +60,7 @@
102+
@@ -52,7 +52,7 @@
103103
/**
104104
* Get the value at @a valueIdx. @a valueIdx assumes AOS ordering.
105105
*/
@@ -108,7 +108,7 @@
108108
{
109109
vtkIdType tupleIdx;
110110
int comp;
111-
@@ -73,7 +73,7 @@
111+
@@ -65,7 +65,7 @@
112112
/**
113113
* Set the value at @a valueIdx to @a value. @a valueIdx assumes AOS ordering.
114114
*/
@@ -117,43 +117,43 @@
117117
{
118118
vtkIdType tupleIdx;
119119
int comp;
120-
@@ -85,7 +85,7 @@
120+
@@ -77,7 +77,7 @@
121121
/**
122122
* Copy the tuple at @a tupleIdx into @a tuple.
123123
*/
124124
- inline void GetTypedTuple(vtkIdType tupleIdx, ValueType* tuple) const
125125
+ inline VTKCOMMONCORE_EXPORT void GetTypedTuple(vtkIdType tupleIdx, ValueType* tuple) const
126126
{
127-
for (size_t cc = 0; cc < this->Data.size(); cc++)
127+
if (this->StorageType == StorageTypeEnum::SOA)
128128
{
129-
@@ -96,7 +96,7 @@
129+
@@ -97,7 +97,7 @@
130130
/**
131131
* Set this array's tuple at @a tupleIdx to the values in @a tuple.
132132
*/
133133
- inline void SetTypedTuple(vtkIdType tupleIdx, const ValueType* tuple)
134134
+ inline VTKCOMMONCORE_EXPORT void SetTypedTuple(vtkIdType tupleIdx, const ValueType* tuple)
135135
{
136-
for (size_t cc = 0; cc < this->Data.size(); ++cc)
136+
if (this->StorageType == StorageTypeEnum::SOA)
137137
{
138-
@@ -107,7 +107,7 @@
138+
@@ -117,7 +117,7 @@
139139
/**
140140
* Get component @a comp of the tuple at @a tupleIdx.
141141
*/
142142
- inline ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
143143
+ inline VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
144144
{
145-
return this->Data[comp]->GetBuffer()[tupleIdx];
146-
}
147-
@@ -115,7 +115,7 @@
145+
if (this->StorageType == StorageTypeEnum::SOA)
146+
{
147+
@@ -129,7 +129,7 @@
148148
/**
149149
* Set component @a comp of the tuple at @a tupleIdx to @a value.
150150
*/
151151
- inline void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
152152
+ inline VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
153153
{
154-
this->Data[comp]->GetBuffer()[tupleIdx] = value;
155-
}
156-
@@ -198,11 +198,11 @@
154+
if (this->StorageType == StorageTypeEnum::SOA)
155+
{
156+
@@ -219,11 +219,11 @@
157157
vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override;
158158
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
159159
// using Superclass::InsertTuples;
@@ -167,4 +167,3 @@
167167
vtkIdType dstStart, vtkIdList* srcIds, vtkAbstractArray* source) override
168168
{
169169
this->Superclass::InsertTuplesStartingAt(dstStart, srcIds, source);
170-

0 commit comments

Comments
 (0)