pool/vtk
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pool:factory
Branches Tags
pool:factory
pool:devel
..
compare: pool:devel
Branches Tags
pool:factory
pool:devel

No commits in common. "factory" and "devel" have entirely different histories.
factory ... devel

6 changed files with 115 additions and 0 deletions
Show Stats Expand all files Collapse all files

72
0001-ioss-update-fmt-includes.patch Normal file
View File

@ -0,0 +1,72 @@
From 4409560bfae26035cebf474b28097464b9ba4634 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Wed, 4 Sep 2024 18:22:50 -0400
Subject: [PATCH] ioss: update fmt includes
---
ThirdParty/ioss/vtkioss/Ioss_IOFactory.C | 2 ++
ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C | 2 ++
ThirdParty/ioss/vtkioss/Ioss_Utils.C | 2 ++
ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C | 2 ++
4 files changed, 8 insertions(+)
diff --git a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
index 440f352e0e..c9f0d422a3 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
@@ -11,7 +11,9 @@
#include <Ioss_Version.h>
#include <cstddef> // for nullptr
#include "vtk_fmt.h"
+#include VTK_FMT(fmt/format.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>
diff --git a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
index 1609c31fae..9afc17edbb 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
@@ -14,7 +14,9 @@
#include <Ioss_SmartAssert.h>
#include <Ioss_StructuredBlock.h>
#include "vtk_fmt.h"
+#include VTK_FMT(fmt/format.h)
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <cstddef> // for size_t
#include <numeric>
diff --git a/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
index 57021abdcb..6a1e2ae243 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
@@ -19,8 +19,10 @@
#include <cstring>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/chrono.h)
+#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 <sstream>
#include <string>
diff --git a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
index 5d324817f2..a1e047f967 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
@@ -8,7 +8,9 @@
#include <Ioss_ZoneConnectivity.h>
#include <cstddef> // for size_t
#include "vtk_fmt.h"
+#include VTK_FMT(fmt/format.h)
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <string> // for string
#include <vector> // for vector
--
2.35.3

16
Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch Normal file
View File

@ -0,0 +1,16 @@
--- a/Rendering/CellGrid/vtkDGOpenGLRenderer.cxx_orig 2023-12-28 06:22:40.696501865 +0100
+++ b/Rendering/CellGrid/vtkDGOpenGLRenderer.cxx 2023-12-28 06:23:24.633470522 +0100
@@ -1046,11 +1046,13 @@
}
// III. Render draw
+#ifndef GL_ES_VERSION_3_0
if (renderer->GetUseImageBasedLighting() && renderer->GetEnvironmentTexture())
{
vtkOpenGLState* ostate = oglRenWin->GetState();
ostate->vtkglEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
}
+#endif
// a. Update shaders
state->CellBO.VAO->Bind();
// state->LastBoundBO = &state->CellBO; // We only bind the one...

3
VTK-9.3.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
size 99932810

3
VTK-9.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
size 99964158

3
VTK-9.4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16f3ffd65fafd68fab469bcb091395bf5432617c7db27cbce86a737bf09ec5b0
size 118611659

18
fix_rendering_core_linkage.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/Rendering/LICOpenGL2/vtk.module_orig 2023-12-27 17:36:03.966016939 +0100
+++ b/Rendering/LICOpenGL2/vtk.module 2023-12-27 17:36:40.199591808 +0100
@@ -14,6 +14,7 @@
VTK::CommonDataModel
VTK::CommonExecutionModel
VTK::RenderingOpenGL2
+ VTK::RenderingCore
PRIVATE_DEPENDS
VTK::CommonMath
VTK::CommonSystem
@@ -22,7 +23,6 @@
VTK::IOXML
VTK::ImagingCore
VTK::ImagingSources
- VTK::RenderingCore
VTK::glew
VTK::opengl
VTK::vtksys