⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 263284 in webkit


Ignore:
Timestamp:
Jun 19, 2020, 2:03:35 PM (6 years ago)
Author:
Jonathan Bedard
Message:

[ANGLE] Correct Catalyst guards
​https://bugs.webkit.org/show_bug.cgi?id=211410
<rdar://problem/62891185>

Reviewed by Dean Jackson.

  • src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp: Do not compile on Mac.
  • src/libANGLE/renderer/gl/eagl/DeviceEAGL.h: Definitions should not be available on Mac.
  • src/libANGLE/renderer/gl/eagl/DisplayEAGL.h: Definitions should not be available on Mac.
  • src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm: Do not compile on Mac.
Location:
trunk/Source/ThirdParty/ANGLE
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r263131 r263284  
     12020-06-19  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [ANGLE] Correct Catalyst guards
     4        https://bugs.webkit.org/show_bug.cgi?id=211410
     5        <rdar://problem/62891185>
     6
     7        Reviewed by Dean Jackson.
     8
     9        * src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp: Do not compile on Mac.
     10        * src/libANGLE/renderer/gl/eagl/DeviceEAGL.h:  Definitions should not be available on Mac.
     11        * src/libANGLE/renderer/gl/eagl/DisplayEAGL.h: Definitions should not be available on Mac.
     12        * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm: Do not compile on Mac.
     13
    1142020-06-10  Dean Jackson  <dino@apple.com>
    215

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp

    r255782 r263284  
    99#import "common/platform.h"
    1010
    11 #if defined(ANGLE_PLATFORM_IOS)
     11#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
    1212
    1313#    include "libANGLE/renderer/gl/eagl/DeviceEAGL.h"
    … …  
    5757}  // namespace rx
    5858
    59 #endif  // defined(ANGLE_PLATFORM_IOS)
     59#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h

    r255782 r263284  
    99#ifndef LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
    1010#define LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
     11
     12#import "common/platform.h"
     13
     14#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
    1115
    1216#include "libANGLE/Device.h"
    … …  
    3135}  // namespace rx
    3236
     37#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
     38
    3339#endif  // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h

    r261185 r263284  
    99#ifndef LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
    1010#define LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
     11
     12#import "common/platform.h"
     13
     14#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
    1115
    1216#include "libANGLE/renderer/gl/DisplayGL.h"
    … …  
    9498}  // namespace rx
    9599
     100#endif // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
     101
    96102#endif  // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm

    r261750 r263284  
    379379}
    380380
    381 #endif  // defined(ANGLE_PLATFORM_IOS)
     381#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
Note: See TracChangeset for help on using the changeset viewer.