Changeset 252992 in webkit
- Timestamp:
- Dec 2, 2019 10:36:07 AM (4 years ago)
- Location:
- trunk/Source
- Files:
-
- 2 added
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
r252989 r252992 456 456 5CB3014F1DE39F4700D2C405 /* DisplayCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301491DE39F4700D2C405 /* DisplayCGL.h */; }; 457 457 5CB301511DE39F4700D2C405 /* PbufferSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */; }; 458 5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048D1DE4144400D2C405 /* OpenGL.framework */; };459 458 5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */; }; 460 459 5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */; }; … … 835 834 313BCE522361133900FC39E5 /* WindowSurfaceEAGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WindowSurfaceEAGL.mm; sourceTree = "<group>"; }; 836 835 313BCE532361133900FC39E5 /* DisplayEAGL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayEAGL.mm; sourceTree = "<group>"; }; 836 3153ACFE239071D900D51DD8 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; }; 837 3153ACFF239071D900D51DD8 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; }; 838 3153AD002390C2EA00D51DD8 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; 839 3153AD022390C32100D51DD8 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 837 840 315EBD3E1FCE43BD00AC7A89 /* uniform_type_info_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uniform_type_info_autogen.cpp; sourceTree = "<group>"; }; 838 841 315EBD401FCE442600AC7A89 /* TranslatorVulkan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TranslatorVulkan.cpp; sourceTree = "<group>"; }; … … 1497 1500 A3694FC523202C5200A83D8F /* BuiltinsWorkaroundGLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltinsWorkaroundGLSL.h; sourceTree = "<group>"; }; 1498 1501 A3E827A8230CAE2C00E76682 /* commit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = commit.h; sourceTree = "<group>"; }; 1499 FB39D0D11200F0E300088E69 /* libANGLE. a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libANGLE.a; sourceTree = BUILT_PRODUCTS_DIR; };1502 FB39D0D11200F0E300088E69 /* libANGLE.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libANGLE.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 1500 1503 FB39D2BF1200F3E600088E69 /* ShaderLang.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ShaderLang.h; sourceTree = "<group>"; }; 1501 1504 /* End PBXFileReference section */ … … 1507 1510 files = ( 1508 1511 5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */, 1509 5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */,1510 1512 5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */, 1511 1513 ); … … 2198 2200 children = ( 2199 2201 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */, 2202 3153AD022390C32100D51DD8 /* IOKit.framework */, 2203 3153AD002390C2EA00D51DD8 /* IOSurface.framework */, 2200 2204 5CB3048D1DE4144400D2C405 /* OpenGL.framework */, 2201 2205 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */, … … 2411 2415 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */, 2412 2416 A1B89B89221E003A00EB4CEA /* SDKVariant.xcconfig */, 2417 3153ACFF239071D900D51DD8 /* Version.xcconfig */, 2418 3153ACFE239071D900D51DD8 /* WebKitTargetConditionals.xcconfig */, 2413 2419 ); 2414 2420 path = Configurations; … … 2499 2505 isa = PBXGroup; 2500 2506 children = ( 2501 FB39D0D11200F0E300088E69 /* libANGLE. a*/,2507 FB39D0D11200F0E300088E69 /* libANGLE.dylib */, 2502 2508 ); 2503 2509 name = Products; … … 2979 2985 name = ANGLE; 2980 2986 productName = angle; 2981 productReference = FB39D0D11200F0E300088E69 /* libANGLE. a*/;2982 productType = "com.apple.product-type.library. static";2987 productReference = FB39D0D11200F0E300088E69 /* libANGLE.dylib */; 2988 productType = "com.apple.product-type.library.dynamic"; 2983 2989 }; 2984 2990 /* End PBXNativeTarget section */ … … 3370 3376 baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */; 3371 3377 buildSettings = { 3372 GCC_PREPROCESSOR_DEFINITIONS = (3373 ANGLE_ENABLE_OPENGL,3374 ANGLE_ENABLE_GLSL,3375 ANGLE_ENABLE_ESSL,3376 GL_SILENCE_DEPRECATION,3377 );3378 HEADER_SEARCH_PATHS = (3379 include,3380 src,3381 third_party/base,3382 src/common/third_party/base,3383 );3384 OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";3385 3378 }; 3386 3379 name = Production; … … 3405 3398 baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */; 3406 3399 buildSettings = { 3407 GCC_PREPROCESSOR_DEFINITIONS = (3408 ANGLE_ENABLE_OPENGL,3409 ANGLE_ENABLE_GLSL,3410 ANGLE_ENABLE_ESSL,3411 GL_SILENCE_DEPRECATION,3412 );3413 HEADER_SEARCH_PATHS = (3414 include,3415 src,3416 third_party/base,3417 src/common/third_party/base,3418 );3419 OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";3420 3400 }; 3421 3401 name = Debug; … … 3425 3405 baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */; 3426 3406 buildSettings = { 3427 GCC_PREPROCESSOR_DEFINITIONS = (3428 ANGLE_ENABLE_OPENGL,3429 ANGLE_ENABLE_GLSL,3430 ANGLE_ENABLE_ESSL,3431 GL_SILENCE_DEPRECATION,3432 );3433 HEADER_SEARCH_PATHS = (3434 include,3435 src,3436 third_party/base,3437 src/common/third_party/base,3438 );3439 OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";3440 3407 }; 3441 3408 name = Release; -
trunk/Source/ThirdParty/ANGLE/ChangeLog
r252989 r252992 1 2019-11-30 Dean Jackson <dino@apple.com> 2 3 Build ANGLE as a dynamic library 4 https://bugs.webkit.org/show_bug.cgi?id=204708 5 rdar://57349384 6 7 Reviewed by Tim Horton. 8 9 Modify ANGLE to build as a dynamic library. My (not thorough) testing suggests 10 this will reduce the in-flight binary size on Apple's build systems by at least 11 a factor of 10 (it was over 1G). Building release for x86_64-only: 12 - Previously: libANGLE.a -- 306 MB 13 - Now: libANGLE.dylib -- 6.7 MB 14 15 In order to do this, some symbols needed to be exported from the 16 "sh" namespace (which are used in ANGLEWebKitBridge, but not when 17 ANGLE's rendering backend is active). 18 19 While here, I turned on some more build options, like ARC. 20 21 * ANGLE.xcodeproj/project.pbxproj: Link with IOKit and IOSurface frameworks, and 22 product a dylib product. 23 * Configurations/ANGLE.xcconfig: Update the configuration for a dynamic library. 24 * Configurations/Base.xcconfig: 25 * Configurations/DebugRelease.xcconfig: 26 * Configurations/Version.xcconfig: Added. 27 * Configurations/WebKitTargetConditionals.xcconfig: Added. 28 29 * include/GLSLANG/ShaderLang.h: Add ANGLE_EXPORT to some functions to make 30 sure they will be visible in the exported library. 31 * include/GLSLANG/ShaderVars.h: 32 * src/libANGLE/renderer/gl/cgl/DisplayCGL.mm: Change reinterpret_cast to a normal 33 C cast so it can be annotated with __bridge. 34 (rx::DisplayCGL::isValidNativeWindow const): 35 * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm: Ditto. 36 (rx::WindowSurfaceCGL::WindowSurfaceCGL): 37 (rx::WindowSurfaceCGL::~WindowSurfaceCGL): 38 * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm: Ditto. 39 * src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm: Ditto. 40 1 41 2019-12-02 James Darpinian <jdarpinian@chromium.org> 2 42 -
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig
r248813 r252992 1 #include "Version.xcconfig" 2 #include "WebKitTargetConditionals.xcconfig" 3 1 4 PRODUCT_NAME = ANGLE; 2 5 3 CLANG_WARN_BOOL_CONVERSION = YES; 4 CLANG_WARN_ENUM_CONVERSION = YES; 5 CLANG_WARN_INT_CONVERSION = YES; 6 COMBINE_HIDPI_IMAGES = NO; 7 ENABLE_STRICT_OBJC_MSGSEND = YES; 8 HEADER_SEARCH_PATHS = include src src/common/third_party/numerics; 9 INSTALL_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/lib; 10 PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/include/ANGLE; 6 EXECUTABLE_PREFIX = lib; 7 8 ANGLE_OTHER_LDFLAGS = $(ANGLE_OTHER_LDFLAGS_$(WK_PLATFORM_NAME)); 9 ANGLE_OTHER_LDFLAGS_iphoneos = -framework IOSurface -framework OpenGLES; 10 ANGLE_OTHER_LDFLAGS_iphonesimulator = $(ANGLE_OTHER_LDFLAGS_iphoneos); 11 ANGLE_OTHER_LDFLAGS_watchos = $(ANGLE_OTHER_LDFLAGS_iphoneos); 12 ANGLE_OTHER_LDFLAGS_watchsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator); 13 ANGLE_OTHER_LDFLAGS_appletvos = $(ANGLE_OTHER_LDFLAGS_iphoneos); 14 ANGLE_OTHER_LDFLAGS_appletvsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator); 15 ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -framework IOSurface -framework OpenGL; 16 ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -framework IOSurface -framework OpenGL; 17 18 INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks; 19 INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); 20 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; 21 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); 22 23 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); 24 DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS)); 25 DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = @loader_path/../../../; 26 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE); 27 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../; 28 29 HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base; 30 31 PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE; 32 USE_HEADERMAP = NO; 33 34 GCC_PREPROCESSOR_DEFINITIONS = LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION; 35 36 INSTALLHDRS_SCRIPT_PHASE = YES; 37 11 38 APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM); -
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
r249312 r252992 1 1 #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig" 2 #include? "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/PlatformSupport.xcconfig" 2 3 #include "SDKVariant.xcconfig" 4 #include "WebKitTargetConditionals.xcconfig" 3 5 4 6 CODE_SIGN_IDENTITY = -; 7 8 SDKROOT = macosx.internal; 5 9 6 10 USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION)); … … 11 15 ALWAYS_SEARCH_USER_PATHS = NO; 12 16 17 CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; 13 18 CLANG_CXX_LANGUAGE_STANDARD = gnu++1z; 14 19 CLANG_CXX_LIBRARY = libc++; 20 CLANG_ENABLE_OBJC_ARC = YES; 15 21 CLANG_ENABLE_OBJC_WEAK = YES; 16 22 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; … … 18 24 CLANG_WARN_COMMA = YES; 19 25 CLANG_WARN_CONSTANT_CONVERSION = YES; 26 CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; 20 27 CLANG_WARN_EMPTY_BODY = YES; 21 28 CLANG_WARN_ENUM_CONVERSION = YES; … … 23 30 CLANG_WARN_INT_CONVERSION = YES; 24 31 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; 25 CLANG_WARN_ DEPRECATED_OBJC_IMPLEMENTATIONS= YES;32 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; 26 33 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; 27 34 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; 35 CLANG_WARN_STRICT_PROTOTYPES = YES; 28 36 CLANG_WARN_SUSPICIOUS_MOVE = YES; 29 CLANG_WARN_STRICT_PROTOTYPES = YES;30 37 CLANG_WARN_UNREACHABLE_CODE = YES; 31 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 32 DEAD_CODE_STRIPPING = YES; 33 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym; 38 34 39 GCC_C_LANGUAGE_STANDARD = gnu99; 35 40 GCC_DEBUGGING_SYMBOLS = default; … … 37 42 GCC_ENABLE_CPP_RTTI = NO; 38 43 GCC_ENABLE_OBJC_EXCEPTIONS = YES; 39 ENABLE_STRICT_OBJC_MSGSEND = YES;40 44 GCC_ENABLE_SYMBOL_SEPARATION = NO; 41 45 GCC_FAST_OBJC_DISPATCH = YES; … … 46 50 GCC_PRECOMPILE_PREFIX_HEADER = NO; 47 51 GCC_SYMBOLS_PRIVATE_EXTERN = YES; 52 GCC_SYMBOLS_PRIVATE_EXTERN = YES; 48 53 GCC_THREADSAFE_STATICS = NO; 49 54 GCC_TREAT_WARNINGS_AS_ERRORS = YES; … … 51 56 GCC_WARN_64_TO_32_BIT_CONVERSION = YES; 52 57 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; 53 GCC_WARN_ABOUT_MISSING_NEWLINE = YES;58 GCC_WARN_ABOUT_MISSING_NEWLINE = NO; 54 59 GCC_WARN_ABOUT_RETURN_TYPE = YES; 55 60 GCC_WARN_UNDECLARED_SELECTOR = YES; 56 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;57 CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;58 61 GCC_WARN_UNINITIALIZED_AUTOS = YES; 59 62 GCC_WARN_UNUSED_FUNCTION = YES; 60 63 GCC_WARN_UNUSED_VARIABLE = YES; 64 65 DEAD_CODE_STRIPPING = YES; 66 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym; 67 ENABLE_STRICT_OBJC_MSGSEND = YES; 68 61 69 PREBINDING = NO; 62 70 STRIP_INSTALLED_PRODUCT = NO; 63 WARNING_CFLAGS = -Wglobal-constructors -Wno- newline-eof -Wno-inconsistent-missing-override;71 WARNING_CFLAGS = -Wglobal-constructors -Wno-inconsistent-missing-override; 64 72 65 73 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; … … 71 79 TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600; 72 80 73 SDKROOT = macosx.internal;74 75 81 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS); 76 82 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS); 77 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) ;83 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_OTHER_LDFLAGS); 78 84 79 85 ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)); 80 86 ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); 81 87 ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/; 88 89 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 90 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; 91 92 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR))); 93 94 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)); 95 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 96 97 WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)); 98 WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR); 82 99 83 100 // Disable on all platforms other than macOS, due to <rdar://problem/49013399>. -
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
r249312 r252992 21 21 SDKROOT_YES = macosx.internal; 22 22 23 WK_RELOCATABLE_FRAMEWORKS = YES; 24 23 25 WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none); 24 26 -
trunk/Source/ThirdParty/ANGLE/include/CMakeLists.txt
r252717 r252992 33 33 34 34 set(glslang_headers 35 export.h 35 36 GLSLANG/ShaderLang.h 36 37 GLSLANG/ShaderVars.h -
trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
r252989 r252992 526 526 // If the function succeeds, the return value is true, else false. 527 527 // 528 bool Initialize();528 ANGLE_EXPORT bool Initialize(); 529 529 // 530 530 // Driver should call this at shutdown. 531 531 // If the function succeeds, the return value is true, else false. 532 532 // 533 bool Finalize();533 ANGLE_EXPORT bool Finalize(); 534 534 535 535 // … … 538 538 // resources: The object to initialize. Will be comparable with memcmp. 539 539 // 540 void InitBuiltInResources(ShBuiltInResources *resources);540 ANGLE_EXPORT void InitBuiltInResources(ShBuiltInResources *resources); 541 541 542 542 // … … 545 545 // Parameters: 546 546 // handle: Specifies the handle of the compiler to be used. 547 const std::string &GetBuiltInResourcesString(const ShHandle handle);547 ANGLE_EXPORT const std::string &GetBuiltInResourcesString(const ShHandle handle); 548 548 549 549 // … … 558 558 // be supported in some configurations. 559 559 // resources: Specifies the built-in resources. 560 ShHandle ConstructCompiler(sh::GLenum type,561 ShShaderSpec spec,562 ShShaderOutput output,563 const ShBuiltInResources *resources);564 void Destruct(ShHandle handle);560 ANGLE_EXPORT ShHandle ConstructCompiler(sh::GLenum type, 561 ShShaderSpec spec, 562 ShShaderOutput output, 563 const ShBuiltInResources *resources); 564 ANGLE_EXPORT void Destruct(ShHandle handle); 565 565 566 566 // … … 588 588 // Can be queried by calling ShGetVariableInfo(). 589 589 // 590 bool Compile(const ShHandle handle,590 ANGLE_EXPORT bool Compile(const ShHandle handle, 591 591 const char *const shaderStrings[], 592 592 size_t numStrings, … … 594 594 595 595 // Clears the results from the previous compilation. 596 void ClearResults(const ShHandle handle);596 ANGLE_EXPORT void ClearResults(const ShHandle handle); 597 597 598 598 // Return the version of the shader language. 599 int GetShaderVersion(const ShHandle handle);599 ANGLE_EXPORT int GetShaderVersion(const ShHandle handle); 600 600 601 601 // Return the currently set language output type. 602 ShShaderOutput GetShaderOutputType(const ShHandle handle);602 ANGLE_EXPORT ShShaderOutput GetShaderOutputType(const ShHandle handle); 603 603 604 604 // Returns null-terminated information log for a compiled shader. 605 605 // Parameters: 606 606 // handle: Specifies the compiler 607 const std::string &GetInfoLog(const ShHandle handle);607 ANGLE_EXPORT const std::string &GetInfoLog(const ShHandle handle); 608 608 609 609 // Returns null-terminated object code for a compiled shader. 610 610 // Parameters: 611 611 // handle: Specifies the compiler 612 const std::string &GetObjectCode(const ShHandle handle);612 ANGLE_EXPORT const std::string &GetObjectCode(const ShHandle handle); 613 613 614 614 // Returns a (original_name, hash) map containing all the user defined names in the shader, … … 616 616 // Parameters: 617 617 // handle: Specifies the compiler 618 const std::map<std::string, std::string> *GetNameHashingMap(const ShHandle handle);618 ANGLE_EXPORT const std::map<std::string, std::string> *GetNameHashingMap(const ShHandle handle); 619 619 620 620 // Shader variable inspection. … … 624 624 // Parameters: 625 625 // handle: Specifies the compiler 626 const std::vector<sh::ShaderVariable> *GetUniforms(const ShHandle handle);627 const std::vector<sh::ShaderVariable> *GetVaryings(const ShHandle handle);628 const std::vector<sh::ShaderVariable> *GetInputVaryings(const ShHandle handle);629 const std::vector<sh::ShaderVariable> *GetOutputVaryings(const ShHandle handle);630 const std::vector<sh::ShaderVariable> *GetAttributes(const ShHandle handle);631 const std::vector<sh::ShaderVariable> *GetOutputVariables(const ShHandle handle);632 const std::vector<sh::InterfaceBlock> *GetInterfaceBlocks(const ShHandle handle);633 const std::vector<sh::InterfaceBlock> *GetUniformBlocks(const ShHandle handle);634 const std::vector<sh::InterfaceBlock> *GetShaderStorageBlocks(const ShHandle handle);635 sh::WorkGroupSize GetComputeShaderLocalGroupSize(const ShHandle handle);626 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetUniforms(const ShHandle handle); 627 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetVaryings(const ShHandle handle); 628 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetInputVaryings(const ShHandle handle); 629 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetOutputVaryings(const ShHandle handle); 630 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetAttributes(const ShHandle handle); 631 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetOutputVariables(const ShHandle handle); 632 ANGLE_EXPORT const std::vector<sh::InterfaceBlock> *GetInterfaceBlocks(const ShHandle handle); 633 ANGLE_EXPORT const std::vector<sh::InterfaceBlock> *GetUniformBlocks(const ShHandle handle); 634 ANGLE_EXPORT const std::vector<sh::InterfaceBlock> *GetShaderStorageBlocks(const ShHandle handle); 635 ANGLE_EXPORT sh::WorkGroupSize GetComputeShaderLocalGroupSize(const ShHandle handle); 636 636 // Returns the number of views specified through the num_views layout qualifier. If num_views is 637 637 // not set, the function returns -1. 638 int GetVertexShaderNumViews(const ShHandle handle);638 ANGLE_EXPORT int GetVertexShaderNumViews(const ShHandle handle); 639 639 640 640 // Returns true if the passed in variables pack in maxVectors followingthe packing rules from the … … 645 645 // maxVectors: the available rows of registers. 646 646 // variables: an array of variables. 647 bool CheckVariablesWithinPackingLimits(int maxVectors,648 const std::vector<sh::ShaderVariable> &variables);647 ANGLE_EXPORT bool CheckVariablesWithinPackingLimits(int maxVectors, 648 const std::vector<sh::ShaderVariable> &variables); 649 649 650 650 // Gives the compiler-assigned register for a shader storage block. … … 655 655 // shaderStorageBlockName: Specifies the shader storage block 656 656 // indexOut: output variable that stores the assigned register 657 bool GetShaderStorageBlockRegister(const ShHandle handle,658 const std::string &shaderStorageBlockName,659 unsigned int *indexOut);657 ANGLE_EXPORT bool GetShaderStorageBlockRegister(const ShHandle handle, 658 const std::string &shaderStorageBlockName, 659 unsigned int *indexOut); 660 660 661 661 // Gives the compiler-assigned register for a uniform block. … … 666 666 // uniformBlockName: Specifies the uniform block 667 667 // indexOut: output variable that stores the assigned register 668 bool GetUniformBlockRegister(const ShHandle handle,669 const std::string &uniformBlockName,670 unsigned int *indexOut);668 ANGLE_EXPORT bool GetUniformBlockRegister(const ShHandle handle, 669 const std::string &uniformBlockName, 670 unsigned int *indexOut); 671 671 672 672 // Gives a map from uniform names to compiler-assigned registers in the default uniform block. 673 673 // Note that the map contains also registers of samplers that have been extracted from structs. 674 const std::map<std::string, unsigned int> *GetUniformRegisterMap(const ShHandle handle);674 ANGLE_EXPORT const std::map<std::string, unsigned int> *GetUniformRegisterMap(const ShHandle handle); 675 675 676 676 // Sampler, image and atomic counters share registers(t type and u type), -
trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
r249823 r252992 11 11 #define GLSLANG_SHADERVARS_H_ 12 12 13 #include "export.h" 14 13 15 #include <algorithm> 14 16 #include <array> … … 63 65 struct ShaderVariable 64 66 { 65 ShaderVariable();67 ANGLE_EXPORT ShaderVariable(); 66 68 ShaderVariable(GLenum typeIn); 67 69 ShaderVariable(GLenum typeIn, unsigned int arraySizeIn); 68 ~ShaderVariable();69 ShaderVariable(const ShaderVariable &other);70 ShaderVariable &operator=(const ShaderVariable &other);70 ANGLE_EXPORT ~ShaderVariable(); 71 ANGLE_EXPORT ShaderVariable(const ShaderVariable &other); 72 ANGLE_EXPORT ShaderVariable &operator=(const ShaderVariable &other); 71 73 bool operator==(const ShaderVariable &other) const; 72 74 bool operator!=(const ShaderVariable &other) const { return !operator==(other); } -
trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
r252989 r252992 293 293 bool DisplayCGL::isValidNativeWindow(EGLNativeWindowType window) const 294 294 { 295 NSObject *layer = reinterpret_cast<NSObject *>(window);295 NSObject *layer = (__bridge NSObject *)window; 296 296 return [layer isKindOfClass:[CALayer class]]; 297 297 } -
trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
r252989 r252992 154 154 mSwapLayer(nil), 155 155 mCurrentSwapId(0), 156 mLayer( reinterpret_cast<CALayer *>(layer)),156 mLayer((__bridge CALayer *)layer), 157 157 mContext(context), 158 158 mFunctions(renderer->getFunctions()), … … 176 176 { 177 177 [mSwapLayer removeFromSuperlayer]; 178 [mSwapLayer release];179 178 mSwapLayer = nil; 180 179 } -
trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
r252250 r252992 138 138 { 139 139 [EAGLContext setCurrentContext:nil]; 140 [mContext release];141 140 mContext = nullptr; 142 141 } … … 269 268 bool DisplayEAGL::isValidNativeWindow(EGLNativeWindowType window) const 270 269 { 271 NSObject *layer = reinterpret_cast<NSObject *>(window);270 NSObject *layer = (__bridge NSObject *)window; 272 271 return [layer isKindOfClass:[CALayer class]]; 273 272 } … … 360 359 { 361 360 [EAGLContext setCurrentContext:nil]; 362 [mContext release];363 361 mContext = nullptr; 364 362 } -
trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
r252250 r252992 139 139 mSwapLayer(nil), 140 140 mCurrentSwapId(0), 141 mLayer( reinterpret_cast<CALayer *>(layer)),141 mLayer((__bridge CALayer *)layer), 142 142 mContext(context), 143 143 mFunctions(renderer->getFunctions()), … … 161 161 { 162 162 [mSwapLayer removeFromSuperlayer]; 163 [mSwapLayer release];164 163 mSwapLayer = nil; 165 164 } -
trunk/Source/WebCore/ChangeLog
r252987 r252992 1 2019-11-30 Dean Jackson <dino@apple.com> 2 3 Build ANGLE as a dynamic library 4 https://bugs.webkit.org/show_bug.cgi?id=204708 5 rdar://57349384 6 7 Reviewed by Tim Horton. 8 9 Weak link against libANGLE.dylib rather than strong link to libANGLE.a. 10 11 * Configurations/WebCore.xcconfig: 12 * Configurations/WebCoreTestSupport.xcconfig: 13 * platform/graphics/ANGLEWebKitBridge.cpp: Early returns if the library was not loaded. 14 (WebCore::ANGLEWebKitBridge::ANGLEWebKitBridge): 15 (WebCore::ANGLEWebKitBridge::cleanupCompilers): 16 (WebCore::ANGLEWebKitBridge::compileShaderSource): 17 (WebCore::ANGLEWebKitBridge::angleAvailable): Static method to detect 18 if the library was loaded. 19 * platform/graphics/ANGLEWebKitBridge.h: 20 * platform/graphics/cocoa/GraphicsContext3DCocoa.mm: Early return if ANGLE was not 21 loaded. 22 (WebCore::GraphicsContext3D::GraphicsContext3D): 23 1 24 2019-12-02 youenn fablet <youenn@apple.com> 2 25 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r251926 r252992 40 40 SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks 41 41 42 LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)"; 42 WK_EMBEDDED_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks 43 WK_EMBEDDED_LIBRARY_DIR[sdk=macosx*] = $(WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); 44 WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; 45 WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); 46 47 LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_EMBEDDED_LIBRARY_DIR)"; 43 48 44 49 WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions; 50 ANGLE_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/ANGLE $(SDKROOT)/usr/local/include/ANGLE; 45 51 LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers; 46 52 47 HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $( LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);53 HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT); 48 54 INFOPLIST_FILE = Info.plist; 49 55 … … 62 68 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier); 63 69 UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp; 64 65 WK_LIBWEBRTC_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks66 WK_LIBWEBRTC_LIBRARY_DIR[sdk=macosx*] = $(WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));67 WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;68 WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);69 70 70 71 WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME)); … … 93 94 WK_IOSURFACE_ACCELERATOR_LDFLAGS_watchos = $(WK_IOSURFACE_ACCELERATOR_LDFLAGS_iphoneos); 94 95 WK_IOSURFACE_ACCELERATOR_LDFLAGS_appletvos = $(WK_IOSURFACE_ACCELERATOR_LDFLAGS_iphoneos); 96 97 WK_ANGLE_LDFLAGS = -weak-lANGLE; 95 98 96 99 WK_LIBWEBRTC_LDFLAGS = $(WK_LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC)); … … 124 127 125 128 // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969> 126 OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc - lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);129 OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_ANGLE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); 127 130 128 131 OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI; -
trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig
r230836 r252992 49 49 DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug); 50 50 51 ANGLE_LDFLAGS = -weak-lANGLE; 52 51 53 LIBWEBRTC_LDFLAGS = $(LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC)); 52 54 LIBWEBRTC_LDFLAGS_ = ; … … 57 59 EXPORTED_SYMBOLS_FILE = ; 58 60 GCC_SYMBOLS_PRIVATE_EXTERN = YES; 59 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);60 OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit $(LIBWEBRTC_LDFLAGS);61 61 62 OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS); 63 OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS); 62 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_LDFLAGS); 63 OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit $(LIBWEBRTC_LDFLAGS) $(ANGLE_LDFLAGS); 64 OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS) $(ANGLE_LDFLAGS); 65 OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS) $(ANGLE_LDFLAGS); 66 64 67 SECT_ORDER_FLAGS = ; -
trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
r225410 r252992 32 32 #include <wtf/StdLibExtras.h> 33 33 34 #if PLATFORM(COCOA) 35 #include <wtf/darwin/WeakLinking.h> 36 #endif 37 34 38 namespace WebCore { 35 39 … … 132 136 , m_shaderSpec(shaderSpec) 133 137 { 138 ASSERT(angleAvailable()); 139 if (!angleAvailable()) 140 return; 141 134 142 // This is a no-op if it's already initialized. 135 143 sh::Initialize(); … … 143 151 void ANGLEWebKitBridge::cleanupCompilers() 144 152 { 153 ASSERT(ANGLEWebKitBridge::angleAvailable()); 154 if (!ANGLEWebKitBridge::angleAvailable()) 155 return; 156 145 157 if (m_fragmentCompiler) 146 158 sh::Destruct(m_fragmentCompiler); … … 163 175 bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, uint64_t extraCompileOptions) 164 176 { 177 ASSERT(ANGLEWebKitBridge::angleAvailable()); 178 if (!ANGLEWebKitBridge::angleAvailable()) 179 return false; 180 165 181 if (!builtCompilers) { 166 182 m_fragmentCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, m_shaderSpec, m_shaderOutput, &m_resources); … … 205 221 } 206 222 223 bool ANGLEWebKitBridge::angleAvailable() 224 { 225 #if PLATFORM(COCOA) 226 return !isNullFunctionPointer(sh::Compile); 227 #else 228 return true; 229 #endif 230 } 231 207 232 } 208 233 -
trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
r252717 r252992 91 91 bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, uint64_t extraCompileOptions = 0); 92 92 93 static bool angleAvailable(); 94 93 95 private: 94 96 -
trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
r252909 r252992 196 196 197 197 #if !USE(ANGLE) 198 ASSERT(ANGLEWebKitBridge::angleAvailable()); 199 if (!ANGLEWebKitBridge::angleAvailable()) 200 return; 201 198 202 #if USE(OPENGL_ES) 199 203 if (m_attrs.isWebGL2) … … 291 295 292 296 #elif USE(ANGLE) 297 298 ASSERT(ANGLEWebKitBridge::angleAvailable()); 299 if (!ANGLEWebKitBridge::angleAvailable()) 300 return; 293 301 294 302 m_displayObj = EGL_GetDisplay(EGL_DEFAULT_DISPLAY);
Note: See TracChangeset
for help on using the changeset viewer.