Changeset 251740 in webkit


Ignore:
Timestamp:
Oct 29, 2019 3:33:42 PM (4 years ago)
Author:
dino@apple.com
Message:

[ANGLE] Put Apple platform compilation guards in a better place
​https://bugs.webkit.org/show_bug.cgi?id=203590
<rdar://problem/56722345>

Reviewed by Simon Fraser.

Move the #define to platform.h.

  • src/common/platform.h:
  • src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp:
  • src/libANGLE/renderer/gl/cgl/DisplayCGL.mm:
  • src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp:
  • src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp:
  • src/libANGLE/renderer/gl/cgl/RendererCGL.cpp:
  • src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
Location:
trunk/Source/ThirdParty/ANGLE
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r251727 r251740  
     12019-10-29  Dean Jackson  <dino@apple.com>
     2
     3        [ANGLE] Put Apple platform compilation guards in a better place
     4        https://bugs.webkit.org/show_bug.cgi?id=203590
     5        <rdar://problem/56722345>
     6
     7        Reviewed by Simon Fraser.
     8
     9        Move the #define to platform.h.
     10
     11        * src/common/platform.h:
     12        * src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp:
     13        * src/libANGLE/renderer/gl/cgl/DisplayCGL.mm:
     14        * src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp:
     15        * src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp:
     16        * src/libANGLE/renderer/gl/cgl/RendererCGL.cpp:
     17        * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
     18
    1192019-10-29  Dean Jackson  <dino@apple.com>
    220

  • trunk/Source/ThirdParty/ANGLE/src/common/platform.h

    r251018 r251740  
    112112#endif      // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
    113113
     114#ifdef ANGLE_PLATFORM_APPLE
     115#    include <TargetConditionals.h>
     116#    if TARGET_OS_OSX
     117#        define ANGLE_PLATFORM_MACOS 1
     118#    elif TARGET_OS_IOS
     119#        define ANGLE_PLATFORM_IOS 1
     120#    endif
     121#endif
     122
    114123#endif  // COMMON_PLATFORM_H_

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp

    r251510 r251740  
    77// DeviceCGL.cpp: CGL implementation of egl::Device
    88
    9 #if defined(__APPLE__)
    10 #include <TargetConditionals.h>
    11 #if TARGET_OS_OSX
     9#import "common/platform.h"
     10
     11#if defined(ANGLE_PLATFORM_MACOS)
    1212
    1313#include "libANGLE/renderer/gl/cgl/DeviceCGL.h"
    … …  
    6060}  // namespace rx
    6161
    62 #endif  // TARGET_OS_OSX
    63 #endif  // __APPLE__
     62#endif  // defined(ANGLE_PLATFORM_MACOS)

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm

    r251727 r251740  
    77// DisplayCGL.cpp: CGL implementation of egl::Display
    88
    9 #if defined(__APPLE__)
    10 #include <TargetConditionals.h>
    11 #if TARGET_OS_OSX
     9#import "common/platform.h"
     10
     11#if defined(ANGLE_PLATFORM_MACOS)
    1212
    1313#import "libANGLE/renderer/gl/cgl/DisplayCGL.h"
    … …  
    447447}
    448448
    449 #endif  // TARGET_OS_OSX
    450 #endif  // __APPLE__
     449#endif  // defined(ANGLE_PLATFORM_MACOS)

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp

    r251510 r251740  
    88//                        EGL_ANGLE_iosurface_client_buffer
    99
    10 #if defined(__APPLE__)
    11 #include <TargetConditionals.h>
    12 #if TARGET_OS_OSX
     10#import "common/platform.h"
     11
     12#if defined(ANGLE_PLATFORM_MACOS)
    1313
    1414#include "libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h"
    … …  
    336336}  // namespace rx
    337337
    338 #endif  // TARGET_OS_OSX
    339 #endif  // __APPLE__
     338#endif  // defined(ANGLE_PLATFORM_MACOS)

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp

    r251510 r251740  
    88//                      currently implemented using renderbuffers
    99
    10 #if defined(__APPLE__)
    11 #include <TargetConditionals.h>
    12 #if TARGET_OS_OSX
     10#import "common/platform.h"
     11
     12#if defined(ANGLE_PLATFORM_MACOS)
    1313
    1414#include "libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h"
    … …  
    147147}  // namespace rx
    148148
    149 #endif  // TARGET_OS_OSX
    150 #endif  // __APPLE__
     149#endif  // defined(ANGLE_PLATFORM_MACOS)

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp

    r251510 r251740  
    77// RendererCGL.mm: Implements the class methods for RendererCGL.
    88
    9 #if defined(__APPLE__)
    10 #include <TargetConditionals.h>
    11 #if TARGET_OS_OSX
     9#import "common/platform.h"
     10
     11#if defined(ANGLE_PLATFORM_MACOS)
    1212
    1313#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
    … …  
    3232}  // namespace rx
    3333
    34 #endif  // TARGET_OS_OSX
    35 #endif  // __APPLE__
     34#endif  // defined(ANGLE_PLATFORM_MACOS)

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm

    r251510 r251740  
    77// WindowSurfaceCGL.cpp: CGL implementation of egl::Surface for windows
    88
    9 #if defined(__APPLE__)
    10 #include <TargetConditionals.h>
    11 #if TARGET_OS_OSX
     9#import "common/platform.h"
     10
     11#if defined(ANGLE_PLATFORM_MACOS)
    1212
    1313#import "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h"
    … …  
    339339}  // namespace rx
    340340
    341 #endif  // TARGET_OS_OSX
    342 #endif  // __APPLE__
     341#endif  // defined(ANGLE_PLATFORM_MACOS)
Note: See TracChangeset for help on using the changeset viewer.