Skip to content

A
angle
Commit 3c8f582b by James Darpinian Committed by Commit Bot
Options

Build fixes for MacCatalyst

WebKit needs these preprocessor directives because they can't selectively compile files per platform. Bug: angleproject:4613 Change-Id: Ie549cd734c74b50666f3d7e142b885bc78077fc2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2255701 Commit-Queue: James Darpinian <jdarpinian@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com>
parent 916ad955
Showing with 21 additions and 9 deletions
src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "common/platform.h" #import "common/platform.h"
#if defined(ANGLE_PLATFORM_IOS) #if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
# include "libANGLE/renderer/gl/eagl/DeviceEAGL.h" # include "libANGLE/renderer/gl/eagl/DeviceEAGL.h"
...@@ -56,4 +56,4 @@ void DeviceEAGL::generateExtensions(egl::DeviceExtensions *outExtensions) const ...@@ -56,4 +56,4 @@ void DeviceEAGL::generateExtensions(egl::DeviceExtensions *outExtensions) const
} // namespace rx } // namespace rx
#endif // defined(ANGLE_PLATFORM_IOS) #endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
src/libANGLE/renderer/gl/eagl/DeviceEAGL.h
...@@ -9,8 +9,12 @@ ...@@ -9,8 +9,12 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_ #ifndef LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_ #define LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
#include "libANGLE/Device.h" #import "common/platform.h"
#include "libANGLE/renderer/DeviceImpl.h"
#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
# include "libANGLE/Device.h"
# include "libANGLE/renderer/DeviceImpl.h"
namespace rx namespace rx
{ {
...@@ -30,4 +34,6 @@ class DeviceEAGL : public DeviceImpl ...@@ -30,4 +34,6 @@ class DeviceEAGL : public DeviceImpl
} // namespace rx } // namespace rx
#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
#endif // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_ #endif // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
...@@ -9,14 +9,18 @@ ...@@ -9,14 +9,18 @@
#ifndef LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_ #ifndef LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
#define LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_ #define LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
#include "libANGLE/renderer/gl/DisplayGL.h" #import "common/platform.h"
#ifdef __OBJC__ #if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
# include "libANGLE/renderer/gl/DisplayGL.h"
# ifdef __OBJC__
@class EAGLContext; @class EAGLContext;
typedef EAGLContext *EAGLContextObj; typedef EAGLContext *EAGLContextObj;
#else # else
typedef void *EAGLContextObj; typedef void *EAGLContextObj;
#endif # endif
namespace rx namespace rx
{ {
...@@ -93,4 +97,6 @@ class DisplayEAGL : public DisplayGL ...@@ -93,4 +97,6 @@ class DisplayEAGL : public DisplayGL
} // namespace rx } // namespace rx
#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
#endif // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_ #endif // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
...@@ -372,4 +372,4 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features) ...@@ -372,4 +372,4 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features)
} }
} }
#endif // defined(ANGLE_PLATFORM_IOS) #endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment