Changeset 246512 in webkit


Ignore:
Timestamp:
Jun 17, 2019 1:23:46 PM (5 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r246501.

Breaks Apple internal builds.

Reverted changeset:

"Support using ANGLE as the backend for the WebGL
implementation"
​https://bugs.webkit.org/show_bug.cgi?id=197755
​https://trac.webkit.org/changeset/246501

Location:
trunk/Source
Files:
2 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

    r246501 r246512  
    25582558                                312BDB0B15FECAB00097EBC7 /* CopyFiles */,
    25592559                                312BDB0D15FECACE0097EBC7 /* CopyFiles */,
    2560                                 6E28B8742294DD8000717E69 /* ShellScript */,
    25612560                        );
    25622561                        buildRules = (
    … …  
    25962595                };
    25972596/* End PBXProject section */
    2598 
    2599 /* Begin PBXShellScriptBuildPhase section */
    2600                 6E28B8742294DD8000717E69 /* ShellScript */ = {
    2601                         isa = PBXShellScriptBuildPhase;
    2602                         buildActionMask = 2147483647;
    2603                         files = (
    2604                         );
    2605                         inputFileListPaths = (
    2606                         );
    2607                         inputPaths = (
    2608                         );
    2609                         outputFileListPaths = (
    2610                         );
    2611                         outputPaths = (
    2612                         );
    2613                         runOnlyForDeploymentPostprocessing = 0;
    2614                         shellPath = /bin/sh;
    2615                         shellScript = "/bin/sh $SRCROOT/adjust-angle-include-paths.sh\n";
    2616                 };
    2617 /* End PBXShellScriptBuildPhase section */
    26182597
    26192598/* Begin PBXSourcesBuildPhase section */

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r246501 r246512  
     12019-06-17  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r246501.
     4
     5        Breaks Apple internal builds.
     6
     7        Reverted changeset:
     8
     9        "Support using ANGLE as the backend for the WebGL
     10        implementation"
     11        https://bugs.webkit.org/show_bug.cgi?id=197755
     12        https://trac.webkit.org/changeset/246501
     13
    1142019-06-17  Kenneth Russell  <kbr@chromium.org>
    215

  • trunk/Source/WTF/ChangeLog

    r246501 r246512  
     12019-06-17  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r246501.
     4
     5        Breaks Apple internal builds.
     6
     7        Reverted changeset:
     8
     9        "Support using ANGLE as the backend for the WebGL
     10        implementation"
     11        https://bugs.webkit.org/show_bug.cgi?id=197755
     12        https://trac.webkit.org/changeset/246501
     13
    1142019-06-17  Kenneth Russell  <kbr@chromium.org>
    215

  • trunk/Source/WTF/wtf/Platform.h

    r246501 r246512  
    11021102
    11031103#if ENABLE(WEBGL)
    1104 /* USE_ANGLE=1 uses ANGLE for the WebGL backend.
    1105    It replaces USE_OPENGL, USE_OPENGL_ES and USE_EGL. */
    11061104#if PLATFORM(MAC)
    11071105#define USE_OPENGL 1
    11081106#define USE_OPENGL_ES 0
    1109 #define USE_ANGLE 0
    11101107#elif PLATFORM(IOSMAC) && __has_include(<OpenGL/OpenGL.h>)
    11111108#define USE_OPENGL 1
    11121109#define USE_OPENGL_ES 0
    1113 #define USE_ANGLE 0
    11141110#else
    11151111#define USE_OPENGL 0
    11161112#define USE_OPENGL_ES 1
    1117 #define USE_ANGLE 0
    11181113#endif
    11191114#if PLATFORM(COCOA)
    … …  
    11361131#define USE_OPENGL_ES 1
    11371132#define USE_EGL 1
    1138 #endif
    1139 
    1140 #if ENABLE(WEBGL)
    1141 #if (USE_ANGLE && (USE_OPENGL || USE_OPENGL_ES || (defined(USE_EGL) && USE_EGL)))
    1142 #error USE_ANGLE is incompatible with USE_OPENGL, USE_OPENGL_ES and USE_EGL
    1143 #endif
    11441133#endif
    11451134

  • trunk/Source/WebCore/ChangeLog

    r246501 r246512  
     12019-06-17  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r246501.
     4
     5        Breaks Apple internal builds.
     6
     7        Reverted changeset:
     8
     9        "Support using ANGLE as the backend for the WebGL
     10        implementation"
     11        https://bugs.webkit.org/show_bug.cgi?id=197755
     12        https://trac.webkit.org/changeset/246501
     13
    1142019-06-17  Kenneth Russell  <kbr@chromium.org>
    215

  • trunk/Source/WebCore/SourcesCocoa.txt

    r246501 r246512  
    220220
    221221platform/graphics/MediaPlaybackTargetPicker.cpp
    222 
    223 // These sources can't be unified with others in case they are merged
    224 // with files that use the system OpenGL.
    225 platform/graphics/angle/Extensions3DANGLE.cpp @no-unify
    226 platform/graphics/angle/GraphicsContext3DANGLE.cpp @no-unify
    227 platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify
    228222
    229223platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm @no-unify

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r246501 r246512  
    20082008                6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E67D2A51280E8A4008758F7 /* Extensions3DOpenGL.h */; };
    20092009                6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E67D2A81280E8BD008758F7 /* Extensions3D.h */; };
    2010                 6E72F54C229DCD0C00B3E151 /* Extensions3DANGLE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E27F243229C9F8400F1F632 /* Extensions3DANGLE.cpp */; };
    2011                 6E72F54E229DCD1000B3E151 /* GraphicsContext3DANGLE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E27F2422298CE4B00F1F632 /* GraphicsContext3DANGLE.cpp */; };
    2012                 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E290861229DB950000986E2 /* TemporaryANGLESetting.cpp */; };
    2013                 6E72F550229DCD1700B3E151 /* Extensions3DANGLE.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E27F244229C9F8D00F1F632 /* Extensions3DANGLE.h */; };
    2014                 6E72F551229DCD1A00B3E151 /* TemporaryANGLESetting.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E290863229DB970000986E2 /* TemporaryANGLESetting.h */; };
    20152010                6E84E9E117668BF100815B68 /* RasterShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E84E9DF17668BAD00815B68 /* RasterShape.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20162011                6EBF0E4812A8926100DB1709 /* OESTextureFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EBF0E4512A8926100DB1709 /* OESTextureFloat.cpp */; };
    … …  
    91069101                6E21C6BF1126338500A7BE02 /* GraphicsContext3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3D.cpp; sourceTree = "<group>"; };
    91079102                6E21C6C11126339900A7BE02 /* GraphicsContext3DCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DCG.cpp; sourceTree = "<group>"; };
    9108                 6E27F2422298CE4B00F1F632 /* GraphicsContext3DANGLE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DANGLE.cpp; sourceTree = "<group>"; };
    9109                 6E27F243229C9F8400F1F632 /* Extensions3DANGLE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Extensions3DANGLE.cpp; sourceTree = "<group>"; };
    9110                 6E27F244229C9F8D00F1F632 /* Extensions3DANGLE.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Extensions3DANGLE.h; sourceTree = "<group>"; };
    9111                 6E290861229DB950000986E2 /* TemporaryANGLESetting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TemporaryANGLESetting.cpp; sourceTree = "<group>"; };
    9112                 6E290863229DB970000986E2 /* TemporaryANGLESetting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemporaryANGLESetting.h; sourceTree = "<group>"; };
    91139103                6E3FAD3614733F4000E42306 /* JSWebGLCompressedTextureS3TC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTextureS3TC.cpp; sourceTree = "<group>"; };
    91149104                6E3FAD3614733F4000E42307 /* JSWebGLDepthTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLDepthTexture.cpp; sourceTree = "<group>"; };
    … …  
    2041520405                        usesTabs = 0;
    2041620406                };
    20417                 6E27F2412298CE2E00F1F632 /* angle */ = {
    20418                         isa = PBXGroup;
    20419                         children = (
    20420                                 6E27F243229C9F8400F1F632 /* Extensions3DANGLE.cpp */,
    20421                                 6E27F244229C9F8D00F1F632 /* Extensions3DANGLE.h */,
    20422                                 6E27F2422298CE4B00F1F632 /* GraphicsContext3DANGLE.cpp */,
    20423                                 6E290861229DB950000986E2 /* TemporaryANGLESetting.cpp */,
    20424                                 6E290863229DB970000986E2 /* TemporaryANGLESetting.h */,
    20425                         );
    20426                         path = angle;
    20427                         sourceTree = "<group>";
    20428                 };
    2042920407                6FCFC055212DACC2007695D2 /* floats */ = {
    2043020408                        isa = PBXGroup;
    … …  
    2437824356                        isa = PBXGroup;
    2437924357                        children = (
    24380                                 6E27F2412298CE2E00F1F632 /* angle */,
    2438124358                                076F0D0812B8192700C26AA4 /* avfoundation */,
    2438224359                                499B3EC0128CCC1800E726C2 /* ca */,
    … …  
    2906229039                                31DCDF441DA1C45400EA5B93 /* ExtendedColor.h in Headers */,
    2906329040                                6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */,
    29064                                 6E72F550229DCD1700B3E151 /* Extensions3DANGLE.h in Headers */,
    2906529041                                6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */,
    2906629042                                44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */,
    … …  
    3184231818                                7CC564B818BABEA6001B9652 /* TelephoneNumberDetector.h in Headers */,
    3184331819                                C65046A9167BFB5500CC2A4D /* TemplateContentDocumentFragment.h in Headers */,
    31844                                 6E72F551229DCD1A00B3E151 /* TemporaryANGLESetting.h in Headers */,
    3184531820                                26E944DD1AC4B4EA007B85B5 /* Term.h in Headers */,
    3184631821                                6550B6A6099DF0270090D781 /* Text.h in Headers */,
    … …  
    3274232717                                515BE18F1D54F5FB00DD7C68 /* EmptyGamepadProvider.cpp in Sources */,
    3274332718                                724ED32C1A3A7E5400F5F13C /* EXTBlendMinMax.cpp in Sources */,
    32744                                 6E72F54C229DCD0C00B3E151 /* Extensions3DANGLE.cpp in Sources */,
    3274532719                                72F1ADA21A3904DC00014E18 /* EXTFragDepth.cpp in Sources */,
    3274632720                                5C4304B0191AC908000E2BC0 /* EXTShaderTextureLOD.cpp in Sources */,
    … …  
    3275632730                                D084033C221CBF6900007205 /* GPUBuffer.cpp in Sources */,
    3275732731                                6E21C6C01126338500A7BE02 /* GraphicsContext3D.cpp in Sources */,
    32758                                 6E72F54E229DCD1000B3E151 /* GraphicsContext3DANGLE.cpp in Sources */,
    3275932732                                7C3E510B18DF8F3500C112F7 /* HTMLConverter.mm in Sources */,
    3276032733                                A8D06B3A0A265DCD005E7203 /* HTMLNames.cpp in Sources */,
    … …  
    3284132814                                CDC8B5AA18047FF10016E685 /* SourceBufferPrivateAVFObjC.mm in Sources */,
    3284232815                                A833C7CA0A2CF06B00D57664 /* SVGNames.cpp in Sources */,
    32843                                 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */,
    3284432816                                9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
    3284532817                                9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,

  • trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h

    r246501 r246512  
    3939#if USE(OPENGL_ES)
    4040#import <OpenGLES/ES2/glext.h>
    41 #elif USE(OPENGL)
     41#else
    4242#include <OpenGL/gl.h>
    43 #elif USE(ANGLE)
    44 #include <ANGLE/gl2.h>
    45 #else
    46 #error Unsupported configuration
    4743#endif
    4844

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r246501 r246512  
    6565#endif // USE(OPENGL_ES)
    6666
    67 #if USE(OPENGL)
     67#if !USE(OPENGL_ES)
    6868typedef struct _CGLContextObject *CGLContextObj;
    6969typedef CGLContextObj PlatformGraphicsContext3D;
    70 #endif // USE(OPENGL)
    71 
    72 #if USE(ANGLE)
    73 typedef void* PlatformGraphicsContext3D;
    74 #endif // USE(ANGLE)
     70#endif
    7571
    7672OBJC_CLASS CALayer;
    … …  
    9995#if !PLATFORM(COCOA) && USE(OPENGL_ES)
    10096class Extensions3DOpenGLES;
    101 #elif USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES))
     97#else
    10298class Extensions3DOpenGL;
    103 #elif USE(ANGLE)
    104 class Extensions3DANGLE;
    10599#endif
    106100class HostWindow;
    … …  
    14381432#if !PLATFORM(COCOA) && USE(OPENGL_ES)
    14391433    friend class Extensions3DOpenGLES;
     1434    std::unique_ptr<Extensions3DOpenGLES> m_extensions;
     1435#else
     1436    friend class Extensions3DOpenGL;
     1437    std::unique_ptr<Extensions3DOpenGL> m_extensions;
     1438#endif
    14401439    friend class Extensions3DOpenGLCommon;
    1441     std::unique_ptr<Extensions3DOpenGLES> m_extensions;
    1442 #elif USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES))
    1443     friend class Extensions3DOpenGL;
    1444     friend class Extensions3DOpenGLCommon;
    1445     std::unique_ptr<Extensions3DOpenGL> m_extensions;
    1446 #elif USE(ANGLE)
    1447     friend class Extensions3DANGLE;
    1448     std::unique_ptr<Extensions3DANGLE> m_extensions;
    1449 #endif
    14501440
    14511441    GraphicsContext3DAttributes m_attrs;

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3DManager.cpp

    r246501 r246512  
    3636#endif
    3737
    38 #if PLATFORM(MAC) && USE(OPENGL)
     38#if PLATFORM(MAC)
    3939#include "SwitchingGPUClient.h"
    4040#include <OpenGL/OpenGL.h>
    … …  
    135135void GraphicsContext3DManager::updateAllContexts()
    136136{
    137     // FIXME: determine whether to do anything when using ANGLE.
    138 #if PLATFORM(MAC) && USE(OPENGL)
     137#if PLATFORM(MAC)
    139138    for (const auto& context : m_contexts) {
    140139        context->updateCGLContext();
    … …  
    219218void GraphicsContext3DManager::updateHighPerformanceState()
    220219{
    221 #if PLATFORM(MAC) && USE(OPENGL)
     220#if PLATFORM(MAC)
    222221    if (!hasLowAndHighPowerGPUs())
    223222        return;
    … …  
    259258
    260259    m_requestingHighPerformance = false;
    261 #if PLATFORM(MAC) && USE(OPENGL)
     260#if PLATFORM(MAC)
    262261    SwitchingGPUClient::singleton().releaseHighPerformanceGPU();
    263262#endif

  • trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm

    r246501 r246512  
    2929#import "GraphicsContext3D.h"
    3030
    31 #if PLATFORM(IOS_FAMILY) && !USE(ANGLE)
     31#if PLATFORM(IOS_FAMILY)
    3232#import "GraphicsContext3DIOS.h"
    3333#endif
    3434
    3535#import "CanvasRenderingContext.h"
     36#import "Extensions3DOpenGL.h"
    3637#import "GraphicsContext.h"
    3738#import "GraphicsContext3DManager.h"
    … …  
    5657#import <QuartzCore/QuartzCore.h>
    5758#import <pal/spi/ios/OpenGLESSPI.h>
    58 #elif USE(OPENGL)
     59#else
    5960#import <IOKit/IOKitLib.h>
    6061#import <OpenGL/CGLRenderers.h>
    6162#import <OpenGL/gl.h>
    62 #elif USE(ANGLE)
    63 #include <ANGLE/entry_points_gles_2_0_autogen.h>
    64 #endif
    65 
    66 #if USE(OPENGL_ES) || USE(OPENGL)
    67 #include "Extensions3DOpenGL.h"
    68 #elif USE(ANGLE)
    69 #include "Extensions3DANGLE.h"
    7063#endif
    7164
    … …  
    169162}
    170163
    171 #if PLATFORM(MAC) && USE(OPENGL)
     164#if PLATFORM(MAC)
    172165
    173166#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    … …  
    248241#endif
    249242
    250 #endif // PLATFORM(MAC) && USE(OPENGL)
     243#endif // !PLATFORM(MAC)
    251244
    252245GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle, GraphicsContext3D* sharedContext)
    … …  
    254247    , m_private(std::make_unique<GraphicsContext3DPrivate>(this))
    255248{
    256 #if USE(ANGLE)
    257     if (m_attrs.isWebGL2)
    258         m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, SH_WEBGL2_SPEC);
    259     else
    260         m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT);
    261 #else
    262249#if PLATFORM(IOS_FAMILY)
    263250    if (m_attrs.isWebGL2)
    … …  
    268255    if (m_attrs.isWebGL2)
    269256        m_compiler = ANGLEWebKitBridge(SH_GLSL_410_CORE_OUTPUT, SH_WEBGL2_SPEC);
    270 #endif // PLATFORM(IOS_FAMILY)
    271 #endif // USE(ANGLE)
     257#endif
    272258
    273259#if USE(OPENGL_ES)
    … …  
    282268    if (m_attrs.isWebGL2)
    283269        ::glEnable(GraphicsContext3D::PRIMITIVE_RESTART_FIXED_INDEX);
    284 #elif USE(OPENGL)
     270#else
    285271    Vector<CGLPixelFormatAttribute> attribs;
    286272    CGLPixelFormatObj pixelFormatObj = 0;
    … …  
    368354        ::glEnable(GraphicsContext3D::PRIMITIVE_RESTART);
    369355
    370 #elif USE(ANGLE)
    371 
    372     // FIXME: implement context setup via ANGLE.
    373     UNUSED_PARAM(hostWindow);
    374     UNUSED_PARAM(sharedContext);
    375 
    376 #endif
     356#endif // !USE(OPENGL_ES)
    377357   
    378358    validateAttributes();
    … …  
    394374#if USE(OPENGL_ES)
    395375    ::glGenRenderbuffers(1, &m_texture);
    396 #elif USE(OPENGL)
     376#else
    397377    ::glGenTextures(1, &m_texture);
    398378    // We bind to GL_TEXTURE_RECTANGLE_EXT rather than TEXTURE_2D because
    … …  
    404384    ::glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
    405385    ::glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
    406 #elif USE(ANGLE)
    407     // FIXME: implement back buffer setup via ANGLE.
    408 #else
    409 #error Unsupported configuration
    410 #endif
    411 
    412 #if USE(OPENGL) || USE(OPENGL_ES)
     386#endif
     387
    413388    // Create the framebuffer object.
    414389    ::glGenFramebuffersEXT(1, &m_fbo);
    … …  
    428403            ::glGenRenderbuffersEXT(1, &m_multisampleDepthStencilBuffer);
    429404    }
    430 #endif // USE(ANGLE) || USE(OPENGL_ES)
    431 
     405   
    432406    // ANGLE initialization.
    433407
    … …  
    458432#endif
    459433
    460 #if USE(OPENGL) || USE(OPENGL_ES)
    461434    ::glClearColor(0, 0, 0, 0);
    462 #endif
    463435
    464436    LOG(WebGL, "Created a GraphicsContext3D (%p).", this);
    … …  
    474446        [m_contextObj renderbufferStorage:GL_RENDERBUFFER fromDrawable:nil];
    475447        ::glDeleteRenderbuffers(1, &m_texture);
    476 #elif USE(OPENGL)
     448#else
    477449        CGLSetCurrentContext(m_contextObj);
    478450        ::glDeleteTextures(1, &m_texture);
    479 #elif USE(ANGLE)
    480         // FIXME: make context current via ANGLE.
    481 #endif
    482 
    483 #if USE(OPENGL) || USE(OPENGL_ES)
     451#endif
    484452        if (m_attrs.antialias) {
    485453            ::glDeleteRenderbuffersEXT(1, &m_multisampleColorBuffer);
    … …  
    492460        }
    493461        ::glDeleteFramebuffersEXT(1, &m_fbo);
    494 #endif
    495 
    496462#if USE(OPENGL_ES)
    497463        [EAGLContext setCurrentContext:0];
    498464        [static_cast<EAGLContext*>(m_contextObj) release];
    499 #elif USE(OPENGL)
     465#else
    500466        CGLSetCurrentContext(0);
    501467        CGLDestroyContext(m_contextObj);
    502 #elif USE(ANGLE)
    503         // FIXME: implement context teardown via ANGLE.
    504468#endif
    505469        [m_webGLLayer setContext:nullptr];
    … …  
    533497    if ([EAGLContext currentContext] != m_contextObj)
    534498        return [EAGLContext setCurrentContext:static_cast<EAGLContext*>(m_contextObj)];
    535 #elif USE(OPENGL)
     499#else
    536500    CGLContextObj currentContext = CGLGetCurrentContext();
    537501    if (currentContext != m_contextObj)
    538502        return CGLSetCurrentContext(m_contextObj) == kCGLNoError;
    539 #elif USE(ANGLE)
    540     // FIXME: implement making context current via ANGLE.
    541503#endif
    542504    return true;
    … …  
    551513#if USE(OPENGL)
    552514        CGLSetCurrentContext(0);
    553 #elif USE(OPENGL_ES)
     515#else
    554516        [EAGLContext setCurrentContext:0];
    555 #elif USE(ANGLE)
    556         // FIXME: implement forced context loss via ANGLE.
    557517#endif
    558518        return;
    … …  
    577537        CGLSetCurrentContext(0);
    578538    }
    579 #elif USE(OPENGL_ES)
     539#else
    580540    EAGLContext* currentContext = static_cast<EAGLContext*>(PlatformGraphicsContext3D());
    581541    [currentContext getParameter:kEAGLCPGPURestartStatus to:&restartStatus];
    … …  
    585545        [EAGLContext setCurrentContext:0];
    586546    }
    587 #elif USE(ANGLE)
    588     // FIXME: check via KHR_robustness.
    589     restartStatus = 0;
    590547#endif
    591548}
    … …  
    704661    if (!m_contextObj)
    705662        return;
    706 #if USE(ANGLE)
    707     UNUSED_PARAM(displayID);
    708 #else
    709663#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    710     // FIXME: figure out whether to integrate more code into ANGLE to have this effect.
    711 #if USE(OPENGL)
    712664    if (!m_hasSwitchedToHighPerformanceGPU)
    713665        setGPUByRegistryID(m_contextObj, CGLGetPixelFormat(m_contextObj), gpuIDForDisplay(displayID));
    714 #endif
    715666#else
    716667    setGPUByDisplayMask(m_contextObj, CGLGetPixelFormat(m_contextObj), displayMaskForDisplay(displayID));
    717 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    718 #endif // USE(ANGLE)
     668#endif
    719669}
    720670#endif // !PLATFORM(MAC)

  • trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h

    r246501 r246512  
    3939#if USE(OPENGL)
    4040@interface WebGLLayer : CALayer
    41 #elif USE(OPENGL_ES)
     41#else
    4242@interface WebGLLayer : CAEAGLLayer
    43 #elif USE(ANGLE) && PLATFORM(MAC)
    44 @interface WebGLLayer : CALayer
    45 #elif USE(ANGLE) && PLATFORM(IOS_FAMILY)
    46 @interface WebGLLayer : CAEAGLLayer
    47 #else
    48 #error Unsupported platform
    4943#endif
    5044{

  • trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm

    r246501 r246512  
    137137        [self bindFramebufferToNextAvailableSurface];
    138138    }
    139 #elif USE(OPENGL_ES)
     139#else
    140140    _context->presentRenderbuffer();
    141 #elif USE(ANGLE)
    142     // FIXME: display rendering results via ANGLE.
    143141#endif
    144142

  • trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm

    r246501 r246512  
    4040#if USE(OPENGL_ES)
    4141    CVReturn error = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, nullptr, context.platformGraphicsContext3D(), nullptr, &cache);
    42 #elif USE(OPENGL)
     42#else
    4343    CVReturn error = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, nullptr, context.platformGraphicsContext3D(), CGLGetPixelFormat(context.platformGraphicsContext3D()), nullptr, &cache);
    44 #elif USE(ANGLE)
    45     // FIXME: figure out how to do this integrating via ANGLE.
    46     UNUSED_PARAM(context);
    47     CVReturn error = kCVReturnSuccess + 1;
    4844#endif
    4945    if (error != kCVReturnSuccess)
    … …  
    6864    if (kCVReturnSuccess != CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_cache.get(), image, nullptr, outputTarget, internalFormat, width, height, format, type, level, &bareVideoTexture))
    6965        return nullptr;
    70 #elif USE(OPENGL)
     66#else
    7167    UNUSED_PARAM(outputTarget);
    7268    UNUSED_PARAM(level);
    … …  
    7672    if (kCVReturnSuccess != CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_cache.get(), image, nullptr, &bareVideoTexture))
    7773        return nullptr;
    78 #elif USE(ANGLE)
    79     // FIXME: figure out how to do this integrating via ANGLE.
    80     UNUSED_PARAM(image);
    81     UNUSED_PARAM(outputTarget);
    82     UNUSED_PARAM(level);
    83     UNUSED_PARAM(internalFormat);
    84     UNUSED_PARAM(format);
    85     UNUSED_PARAM(type);
    86     return nullptr;
    8774#endif
    8875    RetainPtr<TextureType> videoTexture = adoptCF(bareVideoTexture);

  • trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp

    r246501 r246512  
    404404    if (map.get().empty()) {
    405405        StringMap stringMap;
    406         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB));
    407         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA));
    408         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE_ALPHA));
    409         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE));
    410         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::ALPHA));
    411         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R8));
    412         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R16F));
    413         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R32F));
    414         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R8UI));
    415         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R8I));
    416         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R16UI));
    417         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R16I));
    418         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R32UI));
    419         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R32I));
    420         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG8));
    421         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG16F));
    422         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG32F));
    423         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG8UI));
    424         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG8I));
    425         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG16UI));
    426         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG16I));
    427         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG32UI));
    428         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG32I));
    429         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB8));
    430         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::SRGB8));
    431         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA8));
    432         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::SRGB8_ALPHA8));
    433         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA4));
    434         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB10_A2));
    435         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_COMPONENT16));
    436         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_COMPONENT24));
    437         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_COMPONENT32F));
    438         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH24_STENCIL8));
    439         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH32F_STENCIL8));
    440         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB));
    441         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA));
    442         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE_ALPHA));
    443         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE));
    444         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::ALPHA));
    445         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RED));
    446         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG_INTEGER));
    447         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_STENCIL));
    448         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_BYTE));
    449         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT_5_6_5));
    450         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT_4_4_4_4));
    451         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT_5_5_5_1));
    452         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::BYTE));
    453         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::HALF_FLOAT));
    454         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::FLOAT));
    455         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT));
    456         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::SHORT));
    457         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_INT));
    458         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::INT));
    459         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_INT_2_10_10_10_REV));
    460         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_INT_24_8));
    461         map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::FLOAT_32_UNSIGNED_INT_24_8_REV));
     406        map.get().emplace(STRINGIFY_PAIR(GL_RGB));
     407        map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
     408        map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
     409        map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
     410        map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
     411        map.get().emplace(STRINGIFY_PAIR(GL_R8));
     412        map.get().emplace(STRINGIFY_PAIR(GL_R16F));
     413        map.get().emplace(STRINGIFY_PAIR(GL_R32F));
     414        map.get().emplace(STRINGIFY_PAIR(GL_R8UI));
     415        map.get().emplace(STRINGIFY_PAIR(GL_R8I));
     416        map.get().emplace(STRINGIFY_PAIR(GL_R16UI));
     417        map.get().emplace(STRINGIFY_PAIR(GL_R16I));
     418        map.get().emplace(STRINGIFY_PAIR(GL_R32UI));
     419        map.get().emplace(STRINGIFY_PAIR(GL_R32I));
     420        map.get().emplace(STRINGIFY_PAIR(GL_RG8));
     421        map.get().emplace(STRINGIFY_PAIR(GL_RG16F));
     422        map.get().emplace(STRINGIFY_PAIR(GL_RG32F));
     423        map.get().emplace(STRINGIFY_PAIR(GL_RG8UI));
     424        map.get().emplace(STRINGIFY_PAIR(GL_RG8I));
     425        map.get().emplace(STRINGIFY_PAIR(GL_RG16UI));
     426        map.get().emplace(STRINGIFY_PAIR(GL_RG16I));
     427        map.get().emplace(STRINGIFY_PAIR(GL_RG32UI));
     428        map.get().emplace(STRINGIFY_PAIR(GL_RG32I));
     429        map.get().emplace(STRINGIFY_PAIR(GL_RGB8));
     430        map.get().emplace(STRINGIFY_PAIR(GL_SRGB8));
     431        map.get().emplace(STRINGIFY_PAIR(GL_RGBA8));
     432        map.get().emplace(STRINGIFY_PAIR(GL_SRGB8_ALPHA8));
     433        map.get().emplace(STRINGIFY_PAIR(GL_RGBA4));
     434        map.get().emplace(STRINGIFY_PAIR(GL_RGB10_A2));
     435        map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT16));
     436        map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT24));
     437        map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT32F));
     438        map.get().emplace(STRINGIFY_PAIR(GL_DEPTH24_STENCIL8));
     439        map.get().emplace(STRINGIFY_PAIR(GL_DEPTH32F_STENCIL8));
     440        map.get().emplace(STRINGIFY_PAIR(GL_RGB));
     441        map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
     442        map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
     443        map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
     444        map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
     445        map.get().emplace(STRINGIFY_PAIR(GL_RED));
     446        map.get().emplace(STRINGIFY_PAIR(GL_RG_INTEGER));
     447        map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_STENCIL));
     448        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_BYTE));
     449        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_6_5));
     450        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_4_4_4_4));
     451        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_5_5_1));
     452        map.get().emplace(STRINGIFY_PAIR(GL_BYTE));
     453        map.get().emplace(STRINGIFY_PAIR(GL_HALF_FLOAT));
     454        map.get().emplace(STRINGIFY_PAIR(GL_FLOAT));
     455        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT));
     456        map.get().emplace(STRINGIFY_PAIR(GL_SHORT));
     457        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT));
     458        map.get().emplace(STRINGIFY_PAIR(GL_INT));
     459        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_2_10_10_10_REV));
     460        map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_24_8));
     461        map.get().emplace(STRINGIFY_PAIR(GL_FLOAT_32_UNSIGNED_INT_24_8_REV));
    462462
    463463#if USE(OPENGL_ES)
    … …  
    531531    fragmentShaderSource.appendLiteral("precision mediump float;\n");
    532532    fragmentShaderSource.appendLiteral("uniform sampler2D u_texture;\n");
    533 #elif USE(OPENGL)
     533#else
    534534    fragmentShaderSource.appendLiteral("uniform sampler2DRect u_texture;\n");
    535 #elif USE(ANGLE)
    536     // FIXME: determine how to access rectangular textures via ANGLE.
    537     ASSERT_NOT_REACHED();
    538 #else
    539 #error Unsupported configuration
    540535#endif
    541536    fragmentShaderSource.appendLiteral("varying vec2 v_texturePosition;\n");
    … …  
    547542#if USE(OPENGL_ES)
    548543    fragmentShaderSource.appendLiteral("    vec4 color = texture2D(u_texture, texPos);\n");
    549 #elif USE(OPENGL)
     544#else
    550545    fragmentShaderSource.appendLiteral("    vec4 color = texture2DRect(u_texture, texPos);\n");
    551 #elif USE(ANGLE)
    552     // FIXME: determine how to access rectangular textures via ANGLE.
    553     ASSERT_NOT_REACHED();
    554 #else
    555 #error Unsupported configuration
    556546#endif
    557547    fragmentShaderSource.appendLiteral("    if (u_swapColorChannels == 1) {\n");
    … …  
    634624        "   v_yTextureCoordinate = normalizedPosition;\n"
    635625        "   v_uvTextureCoordinate = normalizedPosition;\n"
    636 #elif USE(OPENGL)
     626#else
    637627        "   v_yTextureCoordinate = normalizedPosition * u_yTextureSize;\n"
    638628        "   v_uvTextureCoordinate = normalizedPosition * u_uvTextureSize;\n"
    639 #elif USE(ANGLE)
    640         // FIXME: determine how to access rectangular textures via ANGLE.
    641 #else
    642 #error Unsupported configuration
    643629#endif
    644630        "}\n"_s
    … …  
    662648        "#define SAMPLERTYPE sampler2D\n"
    663649        "#define TEXTUREFUNC texture2D\n"
    664 #elif USE(OPENGL)
     650#else
    665651        "#define SAMPLERTYPE sampler2DRect\n"
    666652        "#define TEXTUREFUNC texture2DRect\n"
    667 #elif USE(ANGLE)
    668         // FIXME: determine how to access rectangular textures via ANGLE.
    669 #else
    670 #error Unsupported configuration
    671653#endif
    672654        "uniform SAMPLERTYPE u_yTexture;\n"
    … …  
    809791#if USE(OPENGL_ES)
    810792    GC3Denum videoTextureTarget = GraphicsContext3D::TEXTURE_2D;
    811 #elif USE(OPENGL)
     793#else
    812794    GC3Denum videoTextureTarget = GL_TEXTURE_RECTANGLE_ARB;
    813 #elif USE(ANGLE)
    814     // FIXME: determine how to access rectangular textures via ANGLE.
    815     GC3Denum videoTextureTarget = GraphicsContext3D::TEXTURE_2D;
    816 #else
    817 #error Unsupported configuration
    818795#endif
    819796    auto uvTexture = m_context->createTexture();
    … …  
    824801    m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
    825802    m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
    826     if (!m_context->texImageIOSurface2D(videoTextureTarget, GraphicsContext3D::RG, uvPlaneWidth, uvPlaneHeight, GraphicsContext3D::RG, GraphicsContext3D::UNSIGNED_BYTE, surface, 1)) {
     803    if (!m_context->texImageIOSurface2D(videoTextureTarget, GL_RG, uvPlaneWidth, uvPlaneHeight, GL_RG, GL_UNSIGNED_BYTE, surface, 1)) {
    827804        m_context->deleteTexture(uvTexture);
    828805        return false;
    … …  
    836813    m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
    837814    m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
    838     if (!m_context->texImageIOSurface2D(videoTextureTarget, GraphicsContext3D::LUMINANCE, yPlaneWidth, yPlaneHeight, GraphicsContext3D::LUMINANCE, GraphicsContext3D::UNSIGNED_BYTE, surface, 0)) {
     815    if (!m_context->texImageIOSurface2D(videoTextureTarget, GL_LUMINANCE, yPlaneWidth, yPlaneHeight, GL_LUMINANCE, GL_UNSIGNED_BYTE, surface, 0)) {
    839816        m_context->deleteTexture(yTexture);
    840817        m_context->deleteTexture(uvTexture);
    … …  
    891868    GC3Denum videoTextureTarget = CVOpenGLESTextureGetTarget(inputVideoTexture);
    892869    CVOpenGLESTextureGetCleanTexCoords(inputVideoTexture, lowerLeft, lowerRight, upperRight, upperLeft);
    893 #elif USE(OPENGL)
     870#else
    894871    Platform3DObject videoTextureName = CVOpenGLTextureGetName(inputVideoTexture);
    895872    GC3Denum videoTextureTarget = CVOpenGLTextureGetTarget(inputVideoTexture);
    896873    CVOpenGLTextureGetCleanTexCoords(inputVideoTexture, lowerLeft, lowerRight, upperRight, upperLeft);
    897 #elif USE(ANGLE)
    898     Platform3DObject videoTextureName = CVOpenGLTextureGetName(inputVideoTexture);
    899     GC3Denum videoTextureTarget = CVOpenGLTextureGetTarget(inputVideoTexture);
    900     CVOpenGLTextureGetCleanTexCoords(inputVideoTexture, lowerLeft, lowerRight, upperRight, upperLeft);
    901     // FIXME: determine how to access rectangular textures via ANGLE.
    902     ASSERT_NOT_REACHED();
    903874#endif
    904875

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

    r246501 r246512  
    2626#include "config.h"
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
     28#if ENABLE(GRAPHICS_CONTEXT_3D)
    2929
    3030#include "Extensions3DOpenGL.h"
    … …  
    309309} // namespace WebCore
    310310
    311 #endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
     311#endif // ENABLE(GRAPHICS_CONTEXT_3D)

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp

    r246501 r246512  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
     29#if ENABLE(GRAPHICS_CONTEXT_3D)
    3030#include "Extensions3DOpenGLCommon.h"
    3131
    … …  
    257257} // namespace WebCore
    258258
    259 #endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
     259#endif // ENABLE(GRAPHICS_CONTEXT_3D)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

    r246501 r246512  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
     29#if ENABLE(GRAPHICS_CONTEXT_3D)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    504504}
    505505
    506 #endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
     506#endif // ENABLE(GRAPHICS_CONTEXT_3D)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r246501 r246512  
    2929#include "config.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
     31#if ENABLE(GRAPHICS_CONTEXT_3D)
    3232
    3333#include "GraphicsContext3D.h"
    … …  
    20802080}
    20812081
    2082 #endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
     2082#endif // ENABLE(GRAPHICS_CONTEXT_3D)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp

    r246501 r246512  
    2929#include "config.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_3D) && USE(OPENGL_ES) && !PLATFORM(IOS_FAMILY)
     31#if ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS_FAMILY)
    3232
    3333#include "GraphicsContext3D.h"
    … …  
    401401}
    402402
    403 #endif // ENABLE(GRAPHICS_CONTEXT_3D) && USE(OPENGL_ES) && !PLATFORM(IOS_FAMILY)
     403#endif // ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS_FAMILY)
Note: See TracChangeset for help on using the changeset viewer.