[base,imaging] Updated base/arch/defines.h for Apple

Swaps ARCH_OS_IOS for ARCH_OS_IPHONE to align with compiler directives.

TARGET_OS_IPHONE refers to all derivative platforms whereas iOS refers
only to iPhone/iPad (Confusing but the case for historical reasons as
documented in TargetConditionals.h within any Apple SDK).

Contribution: Dhruv Govil

See #2949

(Internal change: 2321624)

Author: davidgyu

pxr/base/arch/align.cpp

@@ -26,11 +26,12 @@
 #include "pxr/base/arch/defines.h"
 #include "pxr/base/arch/error.h"
 
-#if defined(ARCH_OS_DARWIN)
+#if defined(ARCH_OS_IPHONE)
+#elif defined(ARCH_OS_DARWIN)
 #   include <sys/malloc.h>
 #else
 #   include <malloc.h>
-#endif /* defined(ARCH_OS_DARWIN) */
+#endif /* defined(ARCH_OS_IPHONE) */
 
 #include <cstdlib>
 

pxr/base/arch/debugger.cpp

@@ -34,7 +34,9 @@
 #if defined(ARCH_OS_LINUX) || defined(ARCH_OS_DARWIN)
 #include "pxr/base/arch/inttypes.h"
 #include <sys/types.h>
+#if !defined(ARCH_OS_IPHONE)
 #include <sys/ptrace.h>
+#endif
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <cstdio>

pxr/base/arch/defines.h

@@ -34,7 +34,10 @@
 #include "TargetConditionals.h"
 #define ARCH_OS_DARWIN
 #if TARGET_OS_IPHONE
-#define ARCH_OS_IOS
+// TARGET_OS_IPHONE refers to all iOS derivative platforms
+// TARGET_OS_IOS refers to iPhone/iPad
+// For now, we specialize for the umbrella TARGET_OS_IPHONE group
+#define ARCH_OS_IPHONE
 #else
 #define ARCH_OS_OSX
 #endif

pxr/base/arch/mallocHook.cpp

@@ -33,11 +33,12 @@
 #endif
 #include <cstring>
 
-#if defined(ARCH_OS_DARWIN)
+#if defined(ARCH_OS_IPHONE)
+#elif defined(ARCH_OS_DARWIN)
 #   include <sys/malloc.h>
 #else
 #   include <malloc.h>
-#endif /* defined(ARCH_OS_DARWIN) */
+#endif /* defined(ARCH_OS_IPHONE) */
 
 PXR_NAMESPACE_OPEN_SCOPE
 

pxr/imaging/garch/glPlatformContextDarwin.mm

@@ -27,7 +27,7 @@
 #include "pxr/pxr.h"
 #include "glPlatformContextDarwin.h"
 
-#ifdef ARCH_OS_IOS
+#ifdef ARCH_OS_IPHONE
 typedef EAGLContext NSGLContext;
 #else
 typedef NSOpenGLContext NSGLContext;
@@ -90,7 +90,7 @@
 void
 GarchNSGLContextState::MakeCurrent()
 {
-#if ARCH_OS_IOS
+#if ARCH_OS_IPHONE
     [EAGLContext setCurrentContext:_detail->context];
 #else
     [_detail->context makeCurrentContext];

pxr/imaging/hgiMetal/capabilities.mm

@@ -50,7 +50,7 @@
     if (@available(macOS 100.100, ios 12.0, *)) {
         unifiedMemory = true;
     } else if (@available(macOS 10.15, ios 13.0, *)) {
-#if defined(ARCH_OS_IOS) || (defined(__MAC_10_15) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_15)
+#if defined(ARCH_OS_IPHONE) || (defined(__MAC_10_15) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_15)
         unifiedMemory = [device hasUnifiedMemory];
 #else
         unifiedMemory = [device isLowPower];

pxr/imaging/hgiMetal/shaderGenerator.mm

@@ -402,7 +402,7 @@ void _Init(
     }
 
     if (@available(macos 100.100, ios 12.0, *)) {
-        header  << "#define ARCH_OS_IOS\n";
+        header  << "#define ARCH_OS_IPHONE\n";
         // Define all iOS 12 feature set enums onwards
         if ([device supportsFeatureSet:MTLFeatureSet(12)])
             header << "#define METAL_FEATURESET_IOS_GPUFAMILY1_v5\n";
@@ -1614,4 +1614,4 @@ void _Init(
 }
 
 
-PXR_NAMESPACE_CLOSE_SCOPE
+PXR_NAMESPACE_CLOSE_SCOPE

pxr/imaging/hio/stbImage.cpp

@@ -439,7 +439,7 @@ Hio_StbImage::ReadCropped(int const cropTop,
     // thus we explicitly call stbi__vertical_flip below - assuming
     // that no other client called stbi_set_flip_vertically_on_load(true).
 
-#if defined(ARCH_OS_IOS)
+#if defined(ARCH_OS_IPHONE)
     stbi_convert_iphone_png_to_rgb(true);
 #endif