Alternative OSD import of generated swift header.

* The documentation is not quite clear how to import generated Swift headers with CXX interop from SwiftPM, attempting this alternative approach.
wabiverse · Nov 13, 2023 · 7ee2628 · 7ee2628
1 parent 4963948
commit 7ee2628
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 47 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1097,8 +1097,8 @@ let package = Package(
       cxxSettings: [
         .headerSearchPath("glLoader"),
         /* autogenerated shader headers. */
-        .define("GPU_SHADERS_SWIFT_OSD_H", to: "../../../.build/\(Arch.hostTriplet)/debug/GPUShaders.build/GPUShaders-Swift.h", .when(configuration: .debug)),
-        .define("GPU_SHADERS_SWIFT_OSD_H", to: "../../../.build/\(Arch.hostTriplet)/release/GPUShaders.build/GPUShaders-Swift.h", .when(configuration: .release)),
+        .define("GPU_SHADERS_SWIFT_OSD_H", to: "../../.build/\(Arch.hostTriplet)/debug/GPUShaders.build/GPUShaders-Swift.h", .when(configuration: .debug)),
+        .define("GPU_SHADERS_SWIFT_OSD_H", to: "../../.build/\(Arch.hostTriplet)/release/GPUShaders.build/GPUShaders-Swift.h", .when(configuration: .release)),
       ],
       swiftSettings: [
         .interoperabilityMode(.Cxx),

diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OSDSurfaceGpuShaders.h b/Sources/OpenSubdiv/include/OpenSubdiv/OSDSurfaceGpuShaders.h
diff --git a/Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h b/Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h
@@ -118,7 +118,6 @@
 #include <OpenSubdiv/OSDSurfaceOpenCLGLVertexBuffer.h>
 #include <OpenSubdiv/OSDSurfaceOpenCLPatchTable.h>
 #include <OpenSubdiv/OSDSurfaceOpenCLVertexBuffer.h>
-#include <OpenSubdiv/OSDSurfaceGpuShaders.h>
 #ifdef __CUDA__
 #include <OpenSubdiv/OSDSurfaceCudaGLVertexBuffer.h>
 #include <OpenSubdiv/OSDSurfaceCudaPatchTable.h>

diff --git a/Sources/OpenSubdiv/osd/GLComputeEvaluator.cpp b/Sources/OpenSubdiv/osd/GLComputeEvaluator.cpp
@@ -24,9 +24,15 @@
 
 #include "glLoader.h"
 
+#if __has_include("GPUShaders/GPUShaders-Swift.h")
+  #include "GPUShaders/GPUShaders-Swift.h"
+#else
+  #define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
+  #include GPU_SHADERS_INC
+#endif
+
 #include "OpenSubdiv/OSDSurfaceGLComputeEvaluator.h"
 #include "OpenSubdiv/OSDSurfaceGLSLPatchShaderSource.h"
-#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include "OpenSubdiv/OSDAdaptiveError.h"
 #include "OpenSubdiv/OSDAdaptiveStencilTable.h"

diff --git a/Sources/OpenSubdiv/osd/GLSLPatchShaderSource.cpp b/Sources/OpenSubdiv/osd/GLSLPatchShaderSource.cpp
@@ -22,9 +22,14 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
+#if __has_include("GPUShaders/GPUShaders-Swift.h")
+  #include "GPUShaders/GPUShaders-Swift.h"
+#else
+  #define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
+  #include GPU_SHADERS_INC
+#endif
 
 #include "OpenSubdiv/OSDSurfaceGLSLPatchShaderSource.h"
-#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 #include <sstream>
 #include <string>
 

diff --git a/Sources/OpenSubdiv/osd/GLXFBEvaluator.cpp b/Sources/OpenSubdiv/osd/GLXFBEvaluator.cpp
@@ -24,9 +24,15 @@
 
 #include "glLoader.h"
 
+#if __has_include("GPUShaders/GPUShaders-Swift.h")
+  #include "GPUShaders/GPUShaders-Swift.h"
+#else
+  #define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
+  #include GPU_SHADERS_INC
+#endif
+
 #include "OpenSubdiv/OSDSurfaceGLXFBEvaluator.h"
 #include "OpenSubdiv/OSDSurfaceGLSLPatchShaderSource.h"
-#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include <cstdio>
 #include <sstream>

diff --git a/Sources/OpenSubdiv/osd/MTLPatchShaderSource.mm b/Sources/OpenSubdiv/osd/MTLPatchShaderSource.mm
@@ -22,16 +22,20 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
+#if __has_include("GPUShaders/GPUShaders-Swift.h")
+  #import "GPUShaders/GPUShaders-Swift.h"
+#else
+  #define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
+  #import GPU_SHADERS_INC
+#endif
+
 #include "OpenSubdiv/OSDAdaptiveError.h"
 #include "OpenSubdiv/OSDSurfaceMTLPatchShaderSource.h"
-#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include <TargetConditionals.h>
 #include <sstream>
 #include <string>
 
-#include GPU_SHADERS_INC
-
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {
 

diff --git a/Sources/OpenSubdiv/osd/hlslPatchShaderSource.cpp b/Sources/OpenSubdiv/osd/hlslPatchShaderSource.cpp
@@ -22,15 +22,19 @@
 //   language governing permissions and limitations under the Apache License.
 //
 
+#if __has_include("GPUShaders/GPUShaders-Swift.h")
+  #include "GPUShaders/GPUShaders-Swift.h"
+#else
+  #define GPU_SHADERS_INC <GPU_SHADERS_SWIFT_OSD_H>
+  #include GPU_SHADERS_INC
+#endif
+
 #include "OpenSubdiv/OSDAdaptiveError.h"
 #include "OpenSubdiv/OSDSurfaceHLSLPatchShaderSource.h"
-#include "OpenSubdiv/OSDSurfaceGpuShaders.h"
 
 #include <sstream>
 #include <string>
 
-#include GPU_SHADERS_INC
-
 namespace OpenSubdiv {
 namespace OPENSUBDIV_VERSION {