Add opensubdiv shaders.

wabiverse · Apr 12, 2024 · 736a3ab · 736a3ab
1 parent b398cc7
commit 736a3ab
Show file tree

Hide file tree

Showing 7 changed files with 12,290 additions and 197 deletions.
diff --git a/Package.swift b/Package.swift
@@ -315,24 +315,11 @@ let package = Package(
       exclude: getConfig(for: .mxGraphEditor).exclude
     ),
 
-    // .target(
-    //   name: "GPUShaders",
-    //   resources: [
-    //     .process("Metal"),
-    //     .process("GL"),
-    //     .process("DX3D"),
-    //   ],
-    //   swiftSettings: [
-    //     .interoperabilityMode(.Cxx),
-    //   ]
-    // ),
-
     .target(
       name: "OpenSubdiv",
       dependencies: [
         .target(name: "MetaTBB"),
         .target(name: "OpenMP"),
-        // .target(name: "GPUShaders"),
       ],
       exclude: getConfig(for: .osd).exclude,
       publicHeadersPath: "include",
@@ -937,8 +924,6 @@ func getConfig(for target: PkgTarget) -> TargetInfo
           "source/MaterialXRenderMsl",
         ]
       #endif /* !os(macOS) && !os(visionOS) && !os(iOS) && !os(tvOS) && !os(watchOS) */
-    // case .gpuShaders:
-    //   break
     case .osd:
       config.exclude = [
         /* disabled for now */
@@ -975,9 +960,6 @@ func getConfig(for target: PkgTarget) -> TargetInfo
       #endif /* !os(macOS) && !os(visionOS) && !os(iOS) && !os(tvOS) && !os(watchOS) */
       config.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)),
       ]
     case .exr:
       break
@@ -1141,10 +1123,6 @@ func getConfig(for target: PkgTarget) -> TargetInfo
           name: "OpenSubdiv",
           targets: ["OpenSubdiv"]
         ),
-        // .library(
-        //   name: "GPUShaders",
-        //   targets: ["GPUShaders"]
-        // ),
         .library(
           name: "OpenMP",
           targets: ["OpenMP"]
@@ -1562,7 +1540,6 @@ enum PkgTarget: String
   case mxGraphEditor = "MXGraphEditor"
   case mxResources = "MXResources"
   case materialx = "MaterialX"
-  /// case gpuShaders = "GPUShaders"
   case osd = "OpenSubdiv"
   case exr = "OpenEXR"
   case oiio = "OpenImageIO"

diff --git a/Sources/GPUShaders/GPUShaders.swift b/Sources/GPUShaders/GPUShaders.swift
@@ -42,12 +42,4 @@ public class GPUShaders
     /*  A metal library. */
     public var metalLib: MTLLibrary!
   #endif /* canImport(Metal) */
-
-  /** Client callsite to use shader. */
-  public func setupMetal() -> String
-  {
-    #if canImport(Metal)
-      metalLib.debugDescription
-    #endif /* canImport(Metal) */
-  }
 }