Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vtk: update to 9.4.0 #22790

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+107 −243
Open

vtk: update to 9.4.0 #22790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions mingw-w64-vtk/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
100-fix-build-vtkm-with-clang-19.patch
101-fix-build-vtkm-with-clang-19_2.patch
102-fix-build-vtkm-with-clang-19_3.patch
12 changes: 0 additions & 12 deletions mingw-w64-vtk/002-Fix-build-with-gcc-13.patch
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions mingw-w64-vtk/002-fix-build-with-anari-on-mingw.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- a/Rendering/ANARI/vtkAnariPolyDataMapperNode.cxx
+++ b/Rendering/ANARI/vtkAnariPolyDataMapperNode.cxx
@@ -37,6 +37,9 @@
#include <memory>
#include <string>
#include <vector>
+#include <cstdint>
+#include <_bsd_types.h>
+typedef uint32_t u_int32_t;

using uvec2 = anari::std_types::uvec2;
using uvec3 = anari::std_types::uvec3;
--- a/Rendering/ANARI/vtkAnariRendererNode.cxx
+++ b/Rendering/ANARI/vtkAnariRendererNode.cxx
@@ -33,6 +33,8 @@
#include "vtkTexture.h"

#include <cmath>
+#include <_bsd_types.h>
+typedef unsigned int uint;

#include <anari/anari_cpp/ext/std.h>

42 changes: 11 additions & 31 deletions mingw-w64-vtk/003-fix-build-with-fmt-11.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,20 @@
--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
--- a/ThirdParty/ioss/vtkioss/Ioss_Field.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_Field.C
@@ -12,6 +12,7 @@
#include <cstddef> // for nullptr
#include <cstdint>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <map> // for _Rb_tree_iterator, etc
#include <ostream> // for basic_ostream, etc
#include <set>
--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
@@ -15,6 +15,7 @@
#include <Ioss_StructuredBlock.h>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)

#include <cstddef> // for size_t
#include <numeric>
--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
@@ -21,6 +21,7 @@
#include VTK_FMT(fmt/chrono.h)
#include <iostream>
#include <string>
#include <vector>
--- a/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
@@ -19,6 +19,7 @@
#include VTK_FMT(fmt/core.h)
#include VTK_FMT(fmt/format.h)
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <fstream>
#include <map>
#include <sstream>
#include <string>
--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
@@ -9,6 +9,7 @@
#include <cstddef> // for size_t
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <string> // for string
#include <vector> // for vector

96 changes: 0 additions & 96 deletions mingw-w64-vtk/005-opencascade-7.8.patch
View file
Open in desktop

This file was deleted.

67 changes: 33 additions & 34 deletions mingw-w64-vtk/007-dll-export-some-functions.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/Common/Core/vtkAOSDataArrayTemplate.h
+++ b/Common/Core/vtkAOSDataArrayTemplate.h
@@ -63,7 +63,7 @@
@@ -75,7 +75,7 @@
/**
* Get the value at @a valueIdx. @a valueIdx assumes AOS ordering.
*/
Expand All @@ -9,7 +9,7 @@
VTK_EXPECTS(0 <= valueIdx && valueIdx < GetNumberOfValues())
{
return this->Buffer->GetBuffer()[valueIdx];
@@ -72,7 +72,7 @@
@@ -84,7 +84,7 @@
/**
* Set the value at @a valueIdx to @a value. @a valueIdx assumes AOS ordering.
*/
Expand All @@ -18,7 +18,7 @@
VTK_EXPECTS(0 <= valueIdx && valueIdx < GetNumberOfValues())
{
this->Buffer->GetBuffer()[valueIdx] = value;
@@ -82,7 +82,7 @@
@@ -94,7 +94,7 @@
/**
* Copy the tuple at @a tupleIdx into @a tuple.
*/
Expand All @@ -27,7 +27,7 @@
VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples())
{
const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents;
@@ -95,7 +95,7 @@
@@ -107,7 +107,7 @@
/**
* Set this array's tuple at @a tupleIdx to the values in @a tuple.
*/
Expand All @@ -36,25 +36,25 @@
VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples())
{
const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents;
@@ -106,7 +106,7 @@
@@ -158,7 +158,7 @@
/**
* Get component @a comp of the tuple at @a tupleIdx.
*/
- ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const VTK_EXPECTS(0 <= tupleIdx &&
+ VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const VTK_EXPECTS(0 <= tupleIdx &&
tupleIdx < GetNumberOfTuples()) VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
- ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
+ VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
VTK_EXPECTS(0 <= tupleIdx && GetNumberOfComponents() * tupleIdx + comp < GetNumberOfValues())
VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
{
return this->Buffer->GetBuffer()[this->NumberOfComponents * tupleIdx + comp];
@@ -116,7 +116,7 @@
@@ -169,7 +169,7 @@
/**
* Set component @a comp of the tuple at @a tupleIdx to @a value.
*/
- void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value) VTK_EXPECTS(0 <= tupleIdx &&
+ VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value) VTK_EXPECTS(0 <= tupleIdx &&
tupleIdx < GetNumberOfTuples()) VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
- void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
+ VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
VTK_EXPECTS(0 <= tupleIdx && GetNumberOfComponents() * tupleIdx + comp < GetNumberOfValues())
VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
{
const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents + comp;
@@ -260,11 +260,11 @@
@@ -314,11 +314,11 @@
vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertTuples;
Expand All @@ -70,7 +70,7 @@
this->Superclass::InsertTuplesStartingAt(dstStart, srcIds, source);
--- a/Common/Core/vtkSetGet.h
+++ b/Common/Core/vtkSetGet.h
@@ -827,7 +827,7 @@
@@ -1076,7 +1076,7 @@
\
public: \
typedef superclass Superclass; \
Expand All @@ -79,16 +79,16 @@
{ \
if (!strcmp(thisClassName, type)) \
{ \
@@ -836,7 +836,7 @@
return superclass::IsTypeOf(type); \
@@ -1088,7 +1088,7 @@
{ \
return this->thisClass::IsTypeOf(type); \
} \
vtkTypeBool IsA(const char* type) override { return this->thisClass::IsTypeOf(type); } \
- static thisClass* SafeDownCast(vtkObjectBase* o) \
+ static VTKCOMMONCORE_EXPORT thisClass* SafeDownCast(vtkObjectBase* o) \
{ \
if (o && o->IsA(thisClassName)) \
{ \
@@ -848,7 +848,7 @@
@@ -1100,7 +1100,7 @@
{ \
return instanceType::SafeDownCast(this->NewInstanceInternal()); \
} \
Expand All @@ -99,7 +99,7 @@
{ \
--- a/Common/Core/vtkSOADataArrayTemplate.h
+++ b/Common/Core/vtkSOADataArrayTemplate.h
@@ -60,7 +60,7 @@
@@ -52,7 +52,7 @@
/**
* Get the value at @a valueIdx. @a valueIdx assumes AOS ordering.
*/
Expand All @@ -108,7 +108,7 @@
{
vtkIdType tupleIdx;
int comp;
@@ -73,7 +73,7 @@
@@ -65,7 +65,7 @@
/**
* Set the value at @a valueIdx to @a value. @a valueIdx assumes AOS ordering.
*/
Expand All @@ -117,43 +117,43 @@
{
vtkIdType tupleIdx;
int comp;
@@ -85,7 +85,7 @@
@@ -77,7 +77,7 @@
/**
* Copy the tuple at @a tupleIdx into @a tuple.
*/
- inline void GetTypedTuple(vtkIdType tupleIdx, ValueType* tuple) const
+ inline VTKCOMMONCORE_EXPORT void GetTypedTuple(vtkIdType tupleIdx, ValueType* tuple) const
{
for (size_t cc = 0; cc < this->Data.size(); cc++)
if (this->StorageType == StorageTypeEnum::SOA)
{
@@ -96,7 +96,7 @@
@@ -97,7 +97,7 @@
/**
* Set this array's tuple at @a tupleIdx to the values in @a tuple.
*/
- inline void SetTypedTuple(vtkIdType tupleIdx, const ValueType* tuple)
+ inline VTKCOMMONCORE_EXPORT void SetTypedTuple(vtkIdType tupleIdx, const ValueType* tuple)
{
for (size_t cc = 0; cc < this->Data.size(); ++cc)
if (this->StorageType == StorageTypeEnum::SOA)
{
@@ -107,7 +107,7 @@
@@ -117,7 +117,7 @@
/**
* Get component @a comp of the tuple at @a tupleIdx.
*/
- inline ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
+ inline VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
{
return this->Data[comp]->GetBuffer()[tupleIdx];
}
@@ -115,7 +115,7 @@
if (this->StorageType == StorageTypeEnum::SOA)
{
@@ -129,7 +129,7 @@
/**
* Set component @a comp of the tuple at @a tupleIdx to @a value.
*/
- inline void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
+ inline VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
{
this->Data[comp]->GetBuffer()[tupleIdx] = value;
}
@@ -198,11 +198,11 @@
if (this->StorageType == StorageTypeEnum::SOA)
{
@@ -219,11 +219,11 @@
vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertTuples;
Expand All @@ -167,4 +167,3 @@
vtkIdType dstStart, vtkIdList* srcIds, vtkAbstractArray* source) override
{
this->Superclass::InsertTuplesStartingAt(dstStart, srcIds, source);

Loading
Loading