Fix MacCatalyst build.
authordino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Feb 2020 19:58:07 +0000 (19:58 +0000)
committerdino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Feb 2020 19:58:07 +0000 (19:58 +0000)
* src/libANGLE/validationEGL.cpp:
(egl::ValidateCreatePbufferFromClientBuffer):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp

index fec8587..8ab65b7 100644 (file)
@@ -1,3 +1,10 @@
+2020-02-05  Dean Jackson  <dino@apple.com>
+
+        Fix MacCatalyst build.
+
+        * src/libANGLE/validationEGL.cpp:
+        (egl::ValidateCreatePbufferFromClientBuffer):
+
 2020-02-04  James Darpinian  <jdarpinian@chromium.org>
 
         Update ANGLE
 2020-02-04  James Darpinian  <jdarpinian@chromium.org>
 
         Update ANGLE
index fdddec0..3548d29 100644 (file)
@@ -1874,18 +1874,18 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display,
 
     if (buftype == EGL_IOSURFACE_ANGLE)
     {
 
     if (buftype == EGL_IOSURFACE_ANGLE)
     {
-#if ANGLE_PLATFORM_MACOS || ANGLE_PLATFORM_MACCATALYST
+#if defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
         if (textureTarget != EGL_TEXTURE_RECTANGLE_ANGLE)
         {
             return EglBadAttribute()
                    << "EGL_IOSURFACE requires the EGL_TEXTURE_RECTANGLE target on desktop macOS";
         }
         if (textureTarget != EGL_TEXTURE_RECTANGLE_ANGLE)
         {
             return EglBadAttribute()
                    << "EGL_IOSURFACE requires the EGL_TEXTURE_RECTANGLE target on desktop macOS";
         }
-#else   // ANGLE_PLATFORM_MACOS || ANGLE_PLATFORM_MACCATALYST
+#else // defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
         if (textureTarget != EGL_TEXTURE_2D)
         {
             return EglBadAttribute() << "EGL_IOSURFACE requires the EGL_TEXTURE_2D target on iOS";
         }
         if (textureTarget != EGL_TEXTURE_2D)
         {
             return EglBadAttribute() << "EGL_IOSURFACE requires the EGL_TEXTURE_2D target on iOS";
         }
-#endif  // ANGLE_PLATFORM_MACOS || ANGLE_PLATFORM_MACCATALYST
+#endif // defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_MACCATALYST)
 
         if (textureFormat != EGL_TEXTURE_RGBA)
         {
 
         if (textureFormat != EGL_TEXTURE_RGBA)
         {