Apple: Enable iOS Imaging support

build_scripts/build_usd.py

@@ -2255,7 +2255,7 @@ def __init__(self, args):
 
         # - Imaging
         self.buildImaging = (args.build_imaging == IMAGING or
-                             args.build_imaging == USD_IMAGING) and not embedded
+                             args.build_imaging == USD_IMAGING)
         self.enablePtex = self.buildImaging and args.enable_ptex
         self.enableOpenVDB = self.buildImaging and args.enable_openvdb
 
@@ -2272,8 +2272,8 @@ def __init__(self, args):
         self.buildPrman = self.buildImaging and args.build_prman
         self.prmanLocation = (os.path.abspath(args.prman_location)
                                if args.prman_location else None)                               
-        self.buildOIIO = args.build_oiio or (self.buildUsdImaging
-                                             and self.buildTests)
+        self.buildOIIO = (args.build_oiio or (self.buildUsdImaging
+                                             and self.buildTests))
         self.buildOCIO = args.build_ocio
 
         # - Alembic Plugin

cmake/defaults/Packages.cmake

@@ -259,7 +259,7 @@ if (PXR_BUILD_IMAGING)
         endif()
     endif()
     # --Opensubdiv
-    set(OPENSUBDIV_USE_GPU ${PXR_ENABLE_GL_SUPPORT})
+    set(OPENSUBDIV_USE_GPU ${PXR_ENABLE_GL_SUPPORT} OR PXR_APPLE_EMBEDDED)
     find_package(OpenSubdiv 3 REQUIRED)
     # --Ptex
     if (PXR_ENABLE_PTEX_SUPPORT)

pxr/imaging/garch/CMakeLists.txt

@@ -11,7 +11,12 @@ if(APPLE)
     set(GARCH_GLPLATFORMCONTEXT       glPlatformContextDarwin)
     set(GARCH_GLPLATFORMDEBUGWINDOW   glPlatformDebugWindowDarwin)
     set(GARCH_SOURCE_EXTENSION        mm)
-    set(GARCH_PLATFORM_LIBRARIES      "-framework AppKit")
+    if(PXR_APPLE_EMBEDDED)
+        set(GARCH_PLATFORM_LIBRARIES      "-framework UIKit")
+    else()
+        set(GARCH_PLATFORM_LIBRARIES      "-framework AppKit")
+    endif()
+
 elseif(X11_FOUND)
     set(GARCH_GLPLATFORMCONTEXT       glPlatformContextGLX)
     set(GARCH_GLPLATFORMDEBUGWINDOW   glPlatformDebugWindowGLX)

pxr/imaging/garch/glPlatformContextDarwin.mm

@@ -5,14 +5,15 @@
 // https://openusd.org/license.
 //
 #import <Foundation/Foundation.h>
-#import <AppKit/NSOpenGL.h>
 
 #include "pxr/pxr.h"
 #include "glPlatformContextDarwin.h"
 
 #ifdef ARCH_OS_IPHONE
+#import <UIKit/UIKit.h>
 typedef EAGLContext NSGLContext;
 #else
+#import <AppKit/NSOpenGL.h>
 typedef NSOpenGLContext NSGLContext;
 #endif
 
@@ -84,7 +85,11 @@
 void
 GarchNSGLContextState::DoneCurrent()
 {
-    [NSGLContext clearCurrentContext];
+#if defined(ARCH_OS_IPHONE)
+  [EAGLContext setCurrentContext:nil];
+#else
+  [NSGLContext clearCurrentContext];
+#endif
 }
 
 GarchGLPlatformContextState
@@ -96,6 +101,9 @@
 void *
 GarchSelectCoreProfileMacVisual()
 {
+#if defined(ARCH_OS_IPHONE)
+return NULL
+#else
     NSOpenGLPixelFormatAttribute attribs[10];
     int c = 0;
 
@@ -105,6 +113,7 @@
     attribs[c++] = 0;
 
     return [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs];
+#endif
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE

pxr/imaging/garch/glPlatformDebugWindowDarwin.mm

@@ -9,12 +9,16 @@
 #include "pxr/imaging/garch/glDebugWindow.h"
 #include "pxr/imaging/garch/glPlatformDebugWindowDarwin.h"
 
+#if defined(ARCH_OS_OSX)
 #import <Cocoa/Cocoa.h>
 #import <OpenGL/OpenGL.h>
 #import <OpenGL/gl.h>
+#endif
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
+#if defined(ARCH_OS_OSX)
+
 static int
 Garch_GetModifierKeys(NSUInteger flags)
 {
@@ -222,4 +226,30 @@ - (void)keyDown:(NSEvent *)event
     [NSApp stop:nil];
 }
 
+#else // IPHONE Derivatives
+
+        PXR_NAMESPACE_OPEN_SCOPE
+
+Garch_GLPlatformDebugWindow::Garch_GLPlatformDebugWindow(GarchGLDebugWindow *w)
+{
+
+}
+
+void Garch_GLPlatformDebugWindow::Init(const char *title, int width, int height, int nSamples)
+{
+
+}
+
+void
+Garch_GLPlatformDebugWindow::Run()
+{
+}
+
+void
+Garch_GLPlatformDebugWindow::ExitApp()
+{
+}
+#endif
+
 PXR_NAMESPACE_CLOSE_SCOPE
+

pxr/imaging/hdSt/CMakeLists.txt

@@ -13,6 +13,11 @@ set(optionalLibs "")
 set(optionalIncludeDirs "")
 set(optionalPublicClasses "")
 set(optionalPrivateClasses "")
+
+if (NOT (PXR_APPLE_EMBEDDED))
+    list(APPEND optionalLibs hgiGL)
+endif()
+
 if (${PXR_ENABLE_MATERIALX_SUPPORT})
     list(APPEND optionalLibs
         MaterialXGenShader
@@ -41,7 +46,6 @@ pxr_library(hdSt
         glf
         hd
         hdsi
-        hgiGL
         hgiInterop
         sdr
         tf

pxr/imaging/hgiGL/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(PXR_PREFIX pxr/imaging)
 set(PXR_PACKAGE hgiGL)
 
-if (NOT ${PXR_ENABLE_GL_SUPPORT})
+if (NOT ${PXR_ENABLE_GL_SUPPORT} AND NOT PXR_APPLE_EMBEDDED)
     message(STATUS
         "Skipping ${PXR_PACKAGE} because PXR_ENABLE_GL_SUPPORT is OFF")
     return()

pxr/imaging/hgiInterop/hgiInterop.cpp

@@ -58,7 +58,7 @@ void HgiInterop::TransferToApp(
         return;
     }
 
-#if defined(PXR_GL_SUPPORT_ENABLED)
+#if defined(PXR_GL_SUPPORT_ENABLED)  && !defined(ARCH_OS_IPHONE)
     if (srcApi == HgiTokens->OpenGL) {
         // Transfer OpenGL textures to OpenGL application
         if (!_hgiInteropImpl->_openGLToOpenGL) {
@@ -86,7 +86,7 @@ void HgiInterop::TransferToApp(
     }
 #endif
 
-#if defined(PXR_METAL_SUPPORT_ENABLED)
+#if defined(PXR_METAL_SUPPORT_ENABLED) && !defined(ARCH_OS_IPHONE)
     if (srcApi == HgiTokens->Metal) {
         // Transfer Metal textures to OpenGL application
         // XXX: It's possible that if we use the same HgiInterop with a 

pxr/imaging/hgiMetal/CMakeLists.txt

@@ -7,14 +7,20 @@ if (NOT ${PXR_BUILD_GPU_SUPPORT} OR NOT ${PXR_ENABLE_METAL_SUPPORT})
     return()
 endif()
 
+if (PXR_APPLE_EMBEDDED)
+    set(APPLE_UI_FRAMEWORK "UIKit")
+else()
+    set(APPLE_UI_FRAMEWORK "AppKit")
+endif()
+
 pxr_library(hgiMetal
     LIBRARIES
         arch
         hgi
         tf
         trace
         "-framework Metal"
-        "-framework AppKit"
+        "-framework ${APPLE_UI_FRAMEWORK}"
 
     PUBLIC_HEADERS
         api.h

pxr/imaging/hgiMetal/blitCmds.mm

@@ -203,7 +203,11 @@
 
     mtlDesc.mipmapLevelCount = dstTexDesc.mipLevels;
     mtlDesc.arrayLength = dstTexDesc.layerCount;
+#if defined(ARCH_OS_OSX)
     mtlDesc.resourceOptions = MTLResourceStorageModeManaged;
+#else
+    mtlDesc.resourceOptions = MTLResourceStorageModeShared;
+#endif
     mtlDesc.sampleCount = 1;
     if (dstTexDesc.type == HgiTextureType3D) {
         mtlDesc.depth = depth;
@@ -380,11 +384,12 @@
         copyOp.gpuSourceBuffer.Get());
 
     _CreateEncoder();
-
+#if defined(ARCH_OS_OSX)
     if ([metalBuffer->GetBufferId() storageMode] == MTLStorageModeManaged) {
         [_blitEncoder performSelector:@selector(synchronizeResource:)
                            withObject:metalBuffer->GetBufferId()];
     }
+#endif
 
     // Offset into the dst buffer
     char* dst = ((char*) copyOp.cpuDestinationBuffer) +

pxr/imaging/hgiMetal/capabilities.mm

@@ -23,13 +23,16 @@
         _SetFlag(HgiDeviceCapabilitiesBitsConcurrentDispatch, true);
     }
 
-    bool const hasIntelGPU = [device isLowPower];
-
+    bool hasIntelGPU = false;
+#if defined(ARCH_OS_OSX)
+    hasIntelGPU = [device isLowPower];
+#endif
     defaultStorageMode = MTLResourceStorageModeShared;
     bool unifiedMemory = false;
     bool barycentrics = false;
     bool hasAppleSilicon = false;
     bool icbSupported = false;
+    bool hasIos = false;
     if (@available(macOS 100.100, ios 12.0, *)) {
         unifiedMemory = true;
     } else if (@available(macOS 10.15, ios 13.0, *)) {
@@ -45,10 +48,16 @@
                     || [device areBarycentricCoordsSupported])
                     && !hasIntelGPU;
 
+#if defined(ARCH_OS_OSX)
         hasAppleSilicon = [device hasUnifiedMemory] && ![device isLowPower];
-        
+#endif
     }
-
+
+
+#if defined(ARCH_OS_IOS)
+    hasIos = true;
+#endif
+
     if (hasAppleSilicon) {
         // Indirect command buffers supported only on
         // Apple Silicon GPUs with macOS 12.3 or later.
@@ -97,10 +106,14 @@
     if (hasIntelGPU) {
         _SetFlag(HgiDeviceCapabilitiesBitsPrimitiveIdEmulation, true);
     }
-
+    if (hasIos && !barycentrics) {
+        _SetFlag(HgiDeviceCapabilitiesBitsPrimitiveIdEmulation, true);
+    }
+#if defined(ARCH_OS_OSX)
     if (!unifiedMemory) {
         defaultStorageMode = MTLResourceStorageModeManaged;
     }
+#endif
 
     _maxUniformBlockSize          = 64 * 1024;
     _maxShaderStorageBlockSize    = 1 * 1024 * 1024 * 1024;

pxr/imaging/hgiMetal/computeCmds.mm

@@ -120,6 +120,7 @@
         thread_height = maxTotalThreads / thread_width;
     }
 
+#if defined(ARCH_OS_OSX)
     if (_argumentBuffer.storageMode != MTLStorageModeShared &&
         [_argumentBuffer respondsToSelector:@selector(didModifyRange:)]) {
         NSRange range = NSMakeRange(0, _argumentBuffer.length);
@@ -129,6 +130,7 @@
         [_argumentBuffer didModifyRange:range];
         ARCH_PRAGMA_POP
     }
+#endif
 
     [_encoder dispatchThreads:MTLSizeMake(dimX, dimY, 1)
         threadsPerThreadgroup:MTLSizeMake(MIN(thread_width, dimX),

pxr/imaging/hgiMetal/conversions.mm

@@ -54,13 +54,21 @@
 
     //MTLPixelFormatRGB8Unorm_sRGB, // Unsupported by HgiFormat
     MTLPixelFormatRGBA8Unorm_sRGB,  // HgiFormatUNorm8Vec4srgb,
-
+#if defined(ARCH_OS_IPHONE)
+    MTLPixelFormatInvalid,      // Unsupported by iOS Metal
+    MTLPixelFormatInvalid,      // Unsupported by iOS Metal
+    MTLPixelFormatInvalid,      // Unsupported by iOS Metal
+    MTLPixelFormatInvalid,      // Unsupported by iOS Metal
+    MTLPixelFormatInvalid,      // Unsupported by iOS Metal
+    MTLPixelFormatInvalid,      // Unsupported by iOS Metal
+#else
     MTLPixelFormatBC6H_RGBFloat,  // HgiFormatBC6FloatVec3
     MTLPixelFormatBC6H_RGBUfloat, // HgiFormatBC6UFloatVec3
     MTLPixelFormatBC7_RGBAUnorm,      // HgiFormatBC7UNorm8Vec4
     MTLPixelFormatBC7_RGBAUnorm_sRGB, // HgiFormatBC7UNorm8Vec4srgb
     MTLPixelFormatBC1_RGBA,           // HgiFormatBC1UNorm8Vec4
     MTLPixelFormatBC3_RGBA,           // HgiFormatBC3UNorm8Vec4
+#endif
 
     MTLPixelFormatDepth32Float_Stencil8, // HgiFormatFloat32UInt8
 

pxr/imaging/hgiMetal/graphicsCmds.mm

@@ -392,6 +392,7 @@
 HgiMetalGraphicsCmds::_SyncArgumentBuffer()
 {
     if (_argumentBuffer) {
+#if defined(ARCH_OS_OSX)
         if (_argumentBuffer.storageMode != MTLStorageModeShared &&
             [_argumentBuffer respondsToSelector:@selector(didModifyRange:)]) {
 
@@ -400,6 +401,7 @@
             [_argumentBuffer didModifyRange:{0, _argumentBuffer.length}];
             ARCH_PRAGMA_POP
         }
+#endif
         _argumentBuffer = nil;
     }
 }
@@ -805,7 +807,9 @@
 
     // Apple Silicon only support memory barriers between vertex stages after
     // macOS 12.3.
-    if (@available(macOS 12.3, *)) {
+    //For iOS we may want to introduce an alternative path
+#if defined(ARCH_OS_OSX)
+    if (@available(macOS 12.3, ios 16.0,  *)) {
         MTLBarrierScope scope = MTLBarrierScopeBuffers;
         MTLRenderStages srcStages = MTLRenderStageVertex;
         MTLRenderStages dstStages = MTLRenderStageVertex;
@@ -816,6 +820,7 @@
                                beforeStages:dstStages];
         }
     }
+#endif
 }
 
 static

pxr/imaging/hgiMetal/hgi.mm

@@ -69,6 +69,7 @@ void Drain() {}
 , _pool(std::make_unique<AutoReleasePool>())
 {
     if (!_device) {
+#if defined(ARCH_OS_OSX)
         if( TfGetenvBool("HGIMETAL_USE_INTEGRATED_GPU", false)) {
             auto devices = MTLCopyAllDevices();
             for (id<MTLDevice> d in devices) {
@@ -78,7 +79,7 @@ void Drain() {}
                 }
             }
         }
-
+#endif
         if (!_device) {
             _device = MTLCreateSystemDefaultDevice();
         }