Remove OpenCL prepro directives

otto-link · Jan 12, 2025 · 6f01e3d · 6f01e3d
1 parent e937f70
commit 6f01e3d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -61,8 +61,6 @@ jobs:
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         -DHESIOD_ENABLE_GENERATE_APP_IMAGE=ON
-        -DHESIOD_ENABLE_OPENCL=ON
-        -DHIGHMAP_ENABLE_OPENCL=ON
         -DHIGHMAP_ENABLE_DOCS=OFF
         -DHIGHMAP_ENABLE_EXAMPLES=OFF
         -DHIGHMAP_ENABLE_TESTS=OFF

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,16 +38,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(spdlog REQUIRED)
 find_package(Qt6 REQUIRED COMPONENTS Core Widgets OpenGL OpenGLWidgets)
 
-set(HESIOD_ENABLE_OPENCL ON)
-if(HESIOD_ENABLE_OPENCL)
-  find_package(OpenCL REQUIRED)
-  message(STATUS "Hesiod: OpenCL enabled")
-  add_compile_definitions(
-    CL_HPP_MINIMUM_OPENCL_VERSION=120 CL_HPP_TARGET_OPENCL_VERSION=120
-    ENABLE_OPENCL=1 HSD_DEFAULT_GPU_MODE=true)
-else()
-  message(STATUS "Hesiod: OpenCL disabled")
-endif(HESIOD_ENABLE_OPENCL)
+add_compile_definitions(
+  CL_HPP_MINIMUM_OPENCL_VERSION=120 CL_HPP_TARGET_OPENCL_VERSION=120
+  HSD_DEFAULT_GPU_MODE=true)
 
 add_subdirectory(external)
 

diff --git a/external/Attributes b/external/Attributes
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -13,7 +13,6 @@ set(GNODEGUI_ENABLE_TESTS OFF)
 add_subdirectory(GNodeGUI)
 
 # HighMap
-set(HIGHMAP_ENABLE_OPENCL ON)
 set(HIGHMAP_ENABLE_DOCS OFF)
 set(HIGHMAP_ENABLE_EXAMPLES OFF)
 set(HIGHMAP_ENABLE_TESTS OFF)

diff --git a/external/HighMap b/external/HighMap
+3 −9		CMakeLists.txt
+1 −0		HighMap/include/highmap.hpp
+18 −0		HighMap/include/highmap/algebra.hpp
+1 −5		HighMap/include/highmap/erosion.hpp
+11 −0		HighMap/include/highmap/geometry/grids.hpp
+1 −5		HighMap/include/highmap/opencl/gpu_opencl.hpp
+0 −4		HighMap/include/highmap/primitives.hpp
+68 −0		HighMap/include/highmap/sdf.hpp
+0 −3		HighMap/src/erosion/hydraulic_schott_gpu.cpp
+22 −2		HighMap/src/geometry/grid.cpp
+1 −3		HighMap/src/gpu_opencl/gpu_opencl.cpp
+45 −0		HighMap/src/gpu_opencl/kernels/sdf_2d_polyline.cl
+0 −3		HighMap/src/gpu_opencl/wrappers_erosion.cpp
+0 −3		HighMap/src/gpu_opencl/wrappers_features.cpp
+0 −3		HighMap/src/gpu_opencl/wrappers_filters.cpp
+0 −3		HighMap/src/gpu_opencl/wrappers_gradient.cpp
+0 −4		HighMap/src/gpu_opencl/wrappers_morphology.cpp
+0 −3		HighMap/src/gpu_opencl/wrappers_operator.cpp
+0 −3		HighMap/src/gpu_opencl/wrappers_primitives.cpp
+0 −3		HighMap/src/gpu_opencl/wrappers_range.cpp
+34 −44		HighMap/src/primitives/primitives_gpu.cpp
+62 −0		HighMap/src/sdf/polyline.cpp
+54 −0		HighMap/src/sdf/polyline_gpu.cpp
+ −		doc/images/ex_sdf_polyline.png
+0 −5		examples/ex_gabor_wave/ex_gabor_wave.cpp
+0 −5		examples/ex_gavoronoise/ex_gavoronoise.cpp
+13 −8		examples/ex_gpu_opencl/ex_gpu_opencl.cpp
+0 −5		examples/ex_hydraulic_schott/ex_hydraulic_schott.cpp
+0 −5		examples/ex_mountain_range_radial/ex_mountain_range_radial.cpp
+2 −0		examples/ex_sdf_polyline/CMakeLists.txt
+27 −0		examples/ex_sdf_polyline/ex_sdf_polyline.cpp
+0 −5		examples/ex_voronoi/ex_voronoi.cpp
+0 −5		examples/ex_voronoi_edge_distance/ex_voronoi_edge_distance.cpp
+0 −5		examples/ex_voronoise/ex_voronoise.cpp
+13 −9		tests/test_gpu_vs_cpu/main.cpp