Address Nick note, and re-enable CMake build of imaging after bad rebase earlier today

Author: dgovil

cmake/defaults/Options.cmake

@@ -52,10 +52,7 @@ if(APPLE)
             MESSAGE(STATUS "Setting PXR_BUILD_USD_TOOLS=OFF because they are not supported on Apple embedded platforms")
             set(PXR_BUILD_USD_TOOLS OFF)
         endif()
-        if (${PXR_BUILD_IMAGING})
-            MESSAGE(STATUS "Setting PXR_BUILD_USD_IMAGING=OFF because it is not supported on Apple embedded platforms")
-            set(PXR_BUILD_IMAGING OFF)
-        endif ()
+        set(PXR_ENABLE_GL_SUPPORT OFF)
     endif ()
 endif()
 

pxr/imaging/hgiMetal/texture.mm

@@ -24,11 +24,12 @@
     MTLTextureUsage usage = MTLTextureUsageShaderRead;
 
     if (desc.initialData && desc.pixelsByteSize > 0) {
-#if defined(ARCH_OS_OSX)
-        resourceOptions = MTLResourceStorageModeManaged;
-#else
-        resourceOptions = MTLResourceStorageModeShared;
-#endif
+        id<MTLDevice> device = hgi->GetPrimaryDevice();
+        if ([device hasUnifiedMemory]) {
+            resourceOptions = MTLResourceStorageModeShared;
+        } else {
+            resourceOptions = MTLResourceStorageModeManaged;
+        }
     }
 
     MTLPixelFormat mtlFormat = HgiMetalConversions::GetPixelFormat(