Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (246511 => 246512)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2019-06-17 20:23:46 UTC (rev 246512)
@@ -2557,7 +2557,6 @@
FB39D0CF1200F0E300088E69 /* Frameworks */,
312BDB0B15FECAB00097EBC7 /* CopyFiles */,
312BDB0D15FECACE0097EBC7 /* CopyFiles */,
- 6E28B8742294DD8000717E69 /* ShellScript */,
);
buildRules = (
);
@@ -2596,26 +2595,6 @@
};
/* End PBXProject section */
-/* Begin PBXShellScriptBuildPhase section */
- 6E28B8742294DD8000717E69 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- outputFileListPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "/bin/sh $SRCROOT/adjust-angle-include-paths.sh\n";
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
FB39D0CE1200F0E300088E69 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (246511 => 246512)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-06-17 20:23:46 UTC (rev 246512)
@@ -1,3 +1,16 @@
+2019-06-17 Ryan Haddad <ryanhad...@apple.com>
+
+ 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
+
2019-06-17 Kenneth Russell <k...@chromium.org>
Support using ANGLE as the backend for the WebGL implementation
Deleted: trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh (246511 => 246512)
--- trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh 2019-06-17 20:23:46 UTC (rev 246512)
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# WebKit builds ANGLE as a static library, and exports some of the
-# internal header files as "public headers" in the Xcode project for
-# consumption by other build targets - e.g. WebCore.
-#
-# The build phase which copies these headers also flattens the
-# directory structure (so that "ANGLE" is the top-level directory
-# containing all of them - e.g., "#include <ANGLE/gl2.h>").
-#
-# It isn't practical to override the include paths so drastically for
-# the other build targets (like WebCore) that we could make the
-# original include paths, like <GLES2/gl2.h> work. Changing them so
-# their namespace is "ANGLE", which implicitly occurs during the "copy
-# headers" phase, is a reasonable solution.
-#
-# This script processes the header files after they're copied during
-# the Copy Header Files build phase, and adjusts their #includes so
-# that they refer to each other. This avoids modifying the ANGLE
-# sources, and allows WebCore to more easily call ANGLE APIs directly.
-
-if [ -z "$BUILT_PRODUCTS_DIR" ] ; then
- echo Requires BUILT_PRODUCTS_DIR environment variable to be set
- exit 1
-fi
-
-output_dir=$BUILT_PRODUCTS_DIR/usr/local/include/ANGLE
-
-for i in $output_dir/*.h ; do
- sed -i -e '
-s/^#include <EGL\/\(.*\)>/#include <ANGLE\/\1>/
-s/^#include <GLES2\/\(.*\)>/#include <ANGLE\/\1>/
-s/^#include <GLES3\/\(.*\)>/#include <ANGLE\/\1>/
-s/^#include <KHR\/\(.*\)>/#include <ANGLE\/\1>/
-s/^#include <export.h>/#include <ANGLE\/export.h>/
-s/^#include "\(eglext_angle\|gl2ext_angle\|ShaderVars\).h"/#include <ANGLE\/\1.h>/
-' $i
-done
Modified: trunk/Source/WTF/ChangeLog (246511 => 246512)
--- trunk/Source/WTF/ChangeLog 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WTF/ChangeLog 2019-06-17 20:23:46 UTC (rev 246512)
@@ -1,3 +1,16 @@
+2019-06-17 Ryan Haddad <ryanhad...@apple.com>
+
+ 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
+
2019-06-17 Kenneth Russell <k...@chromium.org>
Support using ANGLE as the backend for the WebGL implementation
Modified: trunk/Source/WTF/wtf/Platform.h (246511 => 246512)
--- trunk/Source/WTF/wtf/Platform.h 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WTF/wtf/Platform.h 2019-06-17 20:23:46 UTC (rev 246512)
@@ -1101,20 +1101,15 @@
#endif
#if ENABLE(WEBGL)
-/* USE_ANGLE=1 uses ANGLE for the WebGL backend.
- It replaces USE_OPENGL, USE_OPENGL_ES and USE_EGL. */
#if PLATFORM(MAC)
#define USE_OPENGL 1
#define USE_OPENGL_ES 0
-#define USE_ANGLE 0
#elif PLATFORM(IOSMAC) && __has_include(<OpenGL/OpenGL.h>)
#define USE_OPENGL 1
#define USE_OPENGL_ES 0
-#define USE_ANGLE 0
#else
#define USE_OPENGL 0
#define USE_OPENGL_ES 1
-#define USE_ANGLE 0
#endif
#if PLATFORM(COCOA)
#ifndef GL_SILENCE_DEPRECATION
@@ -1137,12 +1132,6 @@
#define USE_EGL 1
#endif
-#if ENABLE(WEBGL)
-#if (USE_ANGLE && (USE_OPENGL || USE_OPENGL_ES || (defined(USE_EGL) && USE_EGL)))
-#error USE_ANGLE is incompatible with USE_OPENGL, USE_OPENGL_ES and USE_EGL
-#endif
-#endif
-
#if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_3D) && !defined(USE_TEXTURE_MAPPER_GL)
#define USE_TEXTURE_MAPPER_GL 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (246511 => 246512)
--- trunk/Source/WebCore/ChangeLog 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/ChangeLog 2019-06-17 20:23:46 UTC (rev 246512)
@@ -1,3 +1,16 @@
+2019-06-17 Ryan Haddad <ryanhad...@apple.com>
+
+ 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
+
2019-06-17 Kenneth Russell <k...@chromium.org>
Support using ANGLE as the backend for the WebGL implementation
Modified: trunk/Source/WebCore/SourcesCocoa.txt (246511 => 246512)
--- trunk/Source/WebCore/SourcesCocoa.txt 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2019-06-17 20:23:46 UTC (rev 246512)
@@ -220,12 +220,6 @@
platform/graphics/MediaPlaybackTargetPicker.cpp
-// These sources can't be unified with others in case they are merged
-// with files that use the system OpenGL.
-platform/graphics/angle/Extensions3DANGLE.cpp @no-unify
-platform/graphics/angle/GraphicsContext3DANGLE.cpp @no-unify
-platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify
-
platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm @no-unify
platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm @no-unify
platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm @no-unify
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (246511 => 246512)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-06-17 20:23:46 UTC (rev 246512)
@@ -2007,11 +2007,6 @@
6E4E91AF10F7FB3100A2779C /* WebGLContextAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4E91AA10F7FB3100A2779C /* WebGLContextAttributes.h */; settings = {ATTRIBUTES = (Private, ); }; };
6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E67D2A51280E8A4008758F7 /* Extensions3DOpenGL.h */; };
6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E67D2A81280E8BD008758F7 /* Extensions3D.h */; };
- 6E72F54C229DCD0C00B3E151 /* Extensions3DANGLE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E27F243229C9F8400F1F632 /* Extensions3DANGLE.cpp */; };
- 6E72F54E229DCD1000B3E151 /* GraphicsContext3DANGLE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E27F2422298CE4B00F1F632 /* GraphicsContext3DANGLE.cpp */; };
- 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E290861229DB950000986E2 /* TemporaryANGLESetting.cpp */; };
- 6E72F550229DCD1700B3E151 /* Extensions3DANGLE.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E27F244229C9F8D00F1F632 /* Extensions3DANGLE.h */; };
- 6E72F551229DCD1A00B3E151 /* TemporaryANGLESetting.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E290863229DB970000986E2 /* TemporaryANGLESetting.h */; };
6E84E9E117668BF100815B68 /* RasterShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E84E9DF17668BAD00815B68 /* RasterShape.h */; settings = {ATTRIBUTES = (Private, ); }; };
6EBF0E4812A8926100DB1709 /* OESTextureFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EBF0E4512A8926100DB1709 /* OESTextureFloat.cpp */; };
6EBF0E4912A8926100DB1709 /* OESTextureFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EBF0E4612A8926100DB1709 /* OESTextureFloat.h */; };
@@ -9105,11 +9100,6 @@
6E0E569A183BFFE600E0E8D5 /* FloatRoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FloatRoundedRect.h; sourceTree = "<group>"; };
6E21C6BF1126338500A7BE02 /* GraphicsContext3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3D.cpp; sourceTree = "<group>"; };
6E21C6C11126339900A7BE02 /* GraphicsContext3DCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DCG.cpp; sourceTree = "<group>"; };
- 6E27F2422298CE4B00F1F632 /* GraphicsContext3DANGLE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DANGLE.cpp; sourceTree = "<group>"; };
- 6E27F243229C9F8400F1F632 /* Extensions3DANGLE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Extensions3DANGLE.cpp; sourceTree = "<group>"; };
- 6E27F244229C9F8D00F1F632 /* Extensions3DANGLE.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Extensions3DANGLE.h; sourceTree = "<group>"; };
- 6E290861229DB950000986E2 /* TemporaryANGLESetting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TemporaryANGLESetting.cpp; sourceTree = "<group>"; };
- 6E290863229DB970000986E2 /* TemporaryANGLESetting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemporaryANGLESetting.h; sourceTree = "<group>"; };
6E3FAD3614733F4000E42306 /* JSWebGLCompressedTextureS3TC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTextureS3TC.cpp; sourceTree = "<group>"; };
6E3FAD3614733F4000E42307 /* JSWebGLDepthTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLDepthTexture.cpp; sourceTree = "<group>"; };
6E3FAD3614733F4010E42307 /* JSWebGLDebugRendererInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLDebugRendererInfo.cpp; sourceTree = "<group>"; };
@@ -20414,18 +20404,6 @@
tabWidth = 4;
usesTabs = 0;
};
- 6E27F2412298CE2E00F1F632 /* angle */ = {
- isa = PBXGroup;
- children = (
- 6E27F243229C9F8400F1F632 /* Extensions3DANGLE.cpp */,
- 6E27F244229C9F8D00F1F632 /* Extensions3DANGLE.h */,
- 6E27F2422298CE4B00F1F632 /* GraphicsContext3DANGLE.cpp */,
- 6E290861229DB950000986E2 /* TemporaryANGLESetting.cpp */,
- 6E290863229DB970000986E2 /* TemporaryANGLESetting.h */,
- );
- path = angle;
- sourceTree = "<group>";
- };
6FCFC055212DACC2007695D2 /* floats */ = {
isa = PBXGroup;
children = (
@@ -24377,7 +24355,6 @@
B2A015910AF6CD53006BCE0E /* graphics */ = {
isa = PBXGroup;
children = (
- 6E27F2412298CE2E00F1F632 /* angle */,
076F0D0812B8192700C26AA4 /* avfoundation */,
499B3EC0128CCC1800E726C2 /* ca */,
B27535290B053814002CE64F /* cg */,
@@ -29061,7 +29038,6 @@
837FB3451F9EA06D00D0FC31 /* ExtendableMessageEvent.h in Headers */,
31DCDF441DA1C45400EA5B93 /* ExtendedColor.h in Headers */,
6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */,
- 6E72F550229DCD1700B3E151 /* Extensions3DANGLE.h in Headers */,
6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */,
44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */,
E47E276516036ED200EE2AFB /* ExtensionStyleSheets.h in Headers */,
@@ -31841,7 +31817,6 @@
F55B3DD61251F12D003EF269 /* TelephoneInputType.h in Headers */,
7CC564B818BABEA6001B9652 /* TelephoneNumberDetector.h in Headers */,
C65046A9167BFB5500CC2A4D /* TemplateContentDocumentFragment.h in Headers */,
- 6E72F551229DCD1A00B3E151 /* TemporaryANGLESetting.h in Headers */,
26E944DD1AC4B4EA007B85B5 /* Term.h in Headers */,
6550B6A6099DF0270090D781 /* Text.h in Headers */,
93309E17099E64920056E581 /* TextAffinity.h in Headers */,
@@ -32741,7 +32716,6 @@
E58B45BB20AD07DD00991025 /* DataListButtonElement.cpp in Sources */,
515BE18F1D54F5FB00DD7C68 /* EmptyGamepadProvider.cpp in Sources */,
724ED32C1A3A7E5400F5F13C /* EXTBlendMinMax.cpp in Sources */,
- 6E72F54C229DCD0C00B3E151 /* Extensions3DANGLE.cpp in Sources */,
72F1ADA21A3904DC00014E18 /* EXTFragDepth.cpp in Sources */,
5C4304B0191AC908000E2BC0 /* EXTShaderTextureLOD.cpp in Sources */,
727AFED41A2EA6AE000442E8 /* EXTsRGB.cpp in Sources */,
@@ -32755,7 +32729,6 @@
837964CF1F8DB69D00218EA0 /* GeolocationPositionIOS.mm in Sources */,
D084033C221CBF6900007205 /* GPUBuffer.cpp in Sources */,
6E21C6C01126338500A7BE02 /* GraphicsContext3D.cpp in Sources */,
- 6E72F54E229DCD1000B3E151 /* GraphicsContext3DANGLE.cpp in Sources */,
7C3E510B18DF8F3500C112F7 /* HTMLConverter.mm in Sources */,
A8D06B3A0A265DCD005E7203 /* HTMLNames.cpp in Sources */,
1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */,
@@ -32840,7 +32813,6 @@
538F10A81F9022A4005102CE /* SoftLinkLibxslt.cpp in Sources */,
CDC8B5AA18047FF10016E685 /* SourceBufferPrivateAVFObjC.mm in Sources */,
A833C7CA0A2CF06B00D57664 /* SVGNames.cpp in Sources */,
- 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */,
9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2019-06-17 20:23:46 UTC (rev 246512)
@@ -38,12 +38,8 @@
#if USE(OPENGL_ES)
#import <OpenGLES/ES2/glext.h>
-#elif USE(OPENGL)
+#else
#include <OpenGL/gl.h>
-#elif USE(ANGLE)
-#include <ANGLE/gl2.h>
-#else
-#error Unsupported configuration
#endif
#elif PLATFORM(WIN)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2019-06-17 20:23:46 UTC (rev 246512)
@@ -64,15 +64,11 @@
#endif // __OBJC__
#endif // USE(OPENGL_ES)
-#if USE(OPENGL)
+#if !USE(OPENGL_ES)
typedef struct _CGLContextObject *CGLContextObj;
typedef CGLContextObj PlatformGraphicsContext3D;
-#endif // USE(OPENGL)
+#endif
-#if USE(ANGLE)
-typedef void* PlatformGraphicsContext3D;
-#endif // USE(ANGLE)
-
OBJC_CLASS CALayer;
OBJC_CLASS WebGLLayer;
typedef struct __IOSurface* IOSurfaceRef;
@@ -98,10 +94,8 @@
class Extensions3D;
#if !PLATFORM(COCOA) && USE(OPENGL_ES)
class Extensions3DOpenGLES;
-#elif USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES))
+#else
class Extensions3DOpenGL;
-#elif USE(ANGLE)
-class Extensions3DANGLE;
#endif
class HostWindow;
class Image;
@@ -1437,16 +1431,12 @@
#if !PLATFORM(COCOA) && USE(OPENGL_ES)
friend class Extensions3DOpenGLES;
- friend class Extensions3DOpenGLCommon;
std::unique_ptr<Extensions3DOpenGLES> m_extensions;
-#elif USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES))
+#else
friend class Extensions3DOpenGL;
- friend class Extensions3DOpenGLCommon;
std::unique_ptr<Extensions3DOpenGL> m_extensions;
-#elif USE(ANGLE)
- friend class Extensions3DANGLE;
- std::unique_ptr<Extensions3DANGLE> m_extensions;
#endif
+ friend class Extensions3DOpenGLCommon;
GraphicsContext3DAttributes m_attrs;
GraphicsContext3DPowerPreference m_powerPreferenceUsedForCreation { GraphicsContext3DPowerPreference::Default };
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3DManager.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3DManager.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3DManager.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -35,7 +35,7 @@
#include <sys/sysctl.h>
#endif
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC)
#include "SwitchingGPUClient.h"
#include <OpenGL/OpenGL.h>
#endif
@@ -134,8 +134,7 @@
void GraphicsContext3DManager::updateAllContexts()
{
- // FIXME: determine whether to do anything when using ANGLE.
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC)
for (const auto& context : m_contexts) {
context->updateCGLContext();
context->dispatchContextChangedNotification();
@@ -218,7 +217,7 @@
void GraphicsContext3DManager::updateHighPerformanceState()
{
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC)
if (!hasLowAndHighPowerGPUs())
return;
@@ -258,7 +257,7 @@
return;
m_requestingHighPerformance = false;
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC)
SwitchingGPUClient::singleton().releaseHighPerformanceGPU();
#endif
}
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm 2019-06-17 20:23:46 UTC (rev 246512)
@@ -28,11 +28,12 @@
#if ENABLE(GRAPHICS_CONTEXT_3D)
#import "GraphicsContext3D.h"
-#if PLATFORM(IOS_FAMILY) && !USE(ANGLE)
+#if PLATFORM(IOS_FAMILY)
#import "GraphicsContext3DIOS.h"
#endif
#import "CanvasRenderingContext.h"
+#import "Extensions3DOpenGL.h"
#import "GraphicsContext.h"
#import "GraphicsContext3DManager.h"
#import "HTMLCanvasElement.h"
@@ -55,20 +56,12 @@
#import <OpenGLES/ES2/glext.h>
#import <QuartzCore/QuartzCore.h>
#import <pal/spi/ios/OpenGLESSPI.h>
-#elif USE(OPENGL)
+#else
#import <IOKit/IOKitLib.h>
#import <OpenGL/CGLRenderers.h>
#import <OpenGL/gl.h>
-#elif USE(ANGLE)
-#include <ANGLE/entry_points_gles_2_0_autogen.h>
#endif
-#if USE(OPENGL_ES) || USE(OPENGL)
-#include "Extensions3DOpenGL.h"
-#elif USE(ANGLE)
-#include "Extensions3DANGLE.h"
-#endif
-
#if PLATFORM(MAC)
#import "ScreenProperties.h"
#endif
@@ -168,7 +161,7 @@
return context;
}
-#if PLATFORM(MAC) && USE(OPENGL)
+#if PLATFORM(MAC)
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
static void setGPUByRegistryID(PlatformGraphicsContext3D contextObj, CGLPixelFormatObj pixelFormatObj, IORegistryGPUID preferredGPUID)
@@ -247,18 +240,12 @@
}
#endif
-#endif // PLATFORM(MAC) && USE(OPENGL)
+#endif // !PLATFORM(MAC)
GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle, GraphicsContext3D* sharedContext)
: m_attrs(attrs)
, m_private(std::make_unique<GraphicsContext3DPrivate>(this))
{
-#if USE(ANGLE)
- if (m_attrs.isWebGL2)
- m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, SH_WEBGL2_SPEC);
- else
- m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT);
-#else
#if PLATFORM(IOS_FAMILY)
if (m_attrs.isWebGL2)
m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, SH_WEBGL2_SPEC);
@@ -267,8 +254,7 @@
#else
if (m_attrs.isWebGL2)
m_compiler = ANGLEWebKitBridge(SH_GLSL_410_CORE_OUTPUT, SH_WEBGL2_SPEC);
-#endif // PLATFORM(IOS_FAMILY)
-#endif // USE(ANGLE)
+#endif
#if USE(OPENGL_ES)
UNUSED_PARAM(hostWindow);
@@ -281,7 +267,7 @@
if (m_attrs.isWebGL2)
::glEnable(GraphicsContext3D::PRIMITIVE_RESTART_FIXED_INDEX);
-#elif USE(OPENGL)
+#else
Vector<CGLPixelFormatAttribute> attribs;
CGLPixelFormatObj pixelFormatObj = 0;
GLint numPixelFormats = 0;
@@ -367,13 +353,7 @@
if (m_isForWebGL2)
::glEnable(GraphicsContext3D::PRIMITIVE_RESTART);
-#elif USE(ANGLE)
-
- // FIXME: implement context setup via ANGLE.
- UNUSED_PARAM(hostWindow);
- UNUSED_PARAM(sharedContext);
-
-#endif
+#endif // !USE(OPENGL_ES)
validateAttributes();
@@ -393,7 +373,7 @@
// Create the texture that will be used for the framebuffer.
#if USE(OPENGL_ES)
::glGenRenderbuffers(1, &m_texture);
-#elif USE(OPENGL)
+#else
::glGenTextures(1, &m_texture);
// We bind to GL_TEXTURE_RECTANGLE_EXT rather than TEXTURE_2D because
// that's what is required for a texture backed by IOSurface.
@@ -403,13 +383,8 @@
::glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
::glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
::glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
-#elif USE(ANGLE)
- // FIXME: implement back buffer setup via ANGLE.
-#else
-#error Unsupported configuration
#endif
-#if USE(OPENGL) || USE(OPENGL_ES)
// Create the framebuffer object.
::glGenFramebuffersEXT(1, &m_fbo);
::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
@@ -427,8 +402,7 @@
if (m_attrs.stencil || m_attrs.depth)
::glGenRenderbuffersEXT(1, &m_multisampleDepthStencilBuffer);
}
-#endif // USE(ANGLE) || USE(OPENGL_ES)
-
+
// ANGLE initialization.
ShBuiltInResources ANGLEResources;
@@ -457,9 +431,7 @@
::glEnable(GL_POINT_SPRITE);
#endif
-#if USE(OPENGL) || USE(OPENGL_ES)
::glClearColor(0, 0, 0, 0);
-#endif
LOG(WebGL, "Created a GraphicsContext3D (%p).", this);
}
@@ -473,14 +445,10 @@
makeContextCurrent();
[m_contextObj renderbufferStorage:GL_RENDERBUFFER fromDrawable:nil];
::glDeleteRenderbuffers(1, &m_texture);
-#elif USE(OPENGL)
+#else
CGLSetCurrentContext(m_contextObj);
::glDeleteTextures(1, &m_texture);
-#elif USE(ANGLE)
- // FIXME: make context current via ANGLE.
#endif
-
-#if USE(OPENGL) || USE(OPENGL_ES)
if (m_attrs.antialias) {
::glDeleteRenderbuffersEXT(1, &m_multisampleColorBuffer);
if (m_attrs.stencil || m_attrs.depth)
@@ -491,16 +459,12 @@
::glDeleteRenderbuffersEXT(1, &m_depthStencilBuffer);
}
::glDeleteFramebuffersEXT(1, &m_fbo);
-#endif
-
#if USE(OPENGL_ES)
[EAGLContext setCurrentContext:0];
[static_cast<EAGLContext*>(m_contextObj) release];
-#elif USE(OPENGL)
+#else
CGLSetCurrentContext(0);
CGLDestroyContext(m_contextObj);
-#elif USE(ANGLE)
- // FIXME: implement context teardown via ANGLE.
#endif
[m_webGLLayer setContext:nullptr];
}
@@ -532,12 +496,10 @@
#if USE(OPENGL_ES)
if ([EAGLContext currentContext] != m_contextObj)
return [EAGLContext setCurrentContext:static_cast<EAGLContext*>(m_contextObj)];
-#elif USE(OPENGL)
+#else
CGLContextObj currentContext = CGLGetCurrentContext();
if (currentContext != m_contextObj)
return CGLSetCurrentContext(m_contextObj) == kCGLNoError;
-#elif USE(ANGLE)
- // FIXME: implement making context current via ANGLE.
#endif
return true;
}
@@ -550,10 +512,8 @@
forceContextLost();
#if USE(OPENGL)
CGLSetCurrentContext(0);
-#elif USE(OPENGL_ES)
+#else
[EAGLContext setCurrentContext:0];
-#elif USE(ANGLE)
- // FIXME: implement forced context loss via ANGLE.
#endif
return;
}
@@ -576,7 +536,7 @@
forceContextLost();
CGLSetCurrentContext(0);
}
-#elif USE(OPENGL_ES)
+#else
EAGLContext* currentContext = static_cast<EAGLContext*>(PlatformGraphicsContext3D());
[currentContext getParameter:kEAGLCPGPURestartStatus to:&restartStatus];
if (restartStatus == kEAGLCPGPURestartStatusCaused || restartStatus == kEAGLCPGPURestartStatusBlacklisted) {
@@ -584,9 +544,6 @@
forceContextLost();
[EAGLContext setCurrentContext:0];
}
-#elif USE(ANGLE)
- // FIXME: check via KHR_robustness.
- restartStatus = 0;
#endif
}
@@ -703,19 +660,12 @@
{
if (!m_contextObj)
return;
-#if USE(ANGLE)
- UNUSED_PARAM(displayID);
-#else
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- // FIXME: figure out whether to integrate more code into ANGLE to have this effect.
-#if USE(OPENGL)
if (!m_hasSwitchedToHighPerformanceGPU)
setGPUByRegistryID(m_contextObj, CGLGetPixelFormat(m_contextObj), gpuIDForDisplay(displayID));
-#endif
#else
setGPUByDisplayMask(m_contextObj, CGLGetPixelFormat(m_contextObj), displayMaskForDisplay(displayID));
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-#endif // USE(ANGLE)
+#endif
}
#endif // !PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h 2019-06-17 20:23:46 UTC (rev 246512)
@@ -38,14 +38,8 @@
#if USE(OPENGL)
@interface WebGLLayer : CALayer
-#elif USE(OPENGL_ES)
+#else
@interface WebGLLayer : CAEAGLLayer
-#elif USE(ANGLE) && PLATFORM(MAC)
-@interface WebGLLayer : CALayer
-#elif USE(ANGLE) && PLATFORM(IOS_FAMILY)
-@interface WebGLLayer : CAEAGLLayer
-#else
-#error Unsupported platform
#endif
{
WebCore::GraphicsContext3D* _context;
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm 2019-06-17 20:23:46 UTC (rev 246512)
@@ -136,10 +136,8 @@
[self reloadValueForKeyPath:@"contents"];
[self bindFramebufferToNextAvailableSurface];
}
-#elif USE(OPENGL_ES)
+#else
_context->presentRenderbuffer();
-#elif USE(ANGLE)
- // FIXME: display rendering results via ANGLE.
#endif
_context->markLayerComposited();
Modified: trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm 2019-06-17 20:23:46 UTC (rev 246512)
@@ -39,12 +39,8 @@
TextureCacheType cache = nullptr;
#if USE(OPENGL_ES)
CVReturn error = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, nullptr, context.platformGraphicsContext3D(), nullptr, &cache);
-#elif USE(OPENGL)
+#else
CVReturn error = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, nullptr, context.platformGraphicsContext3D(), CGLGetPixelFormat(context.platformGraphicsContext3D()), nullptr, &cache);
-#elif USE(ANGLE)
- // FIXME: figure out how to do this integrating via ANGLE.
- UNUSED_PARAM(context);
- CVReturn error = kCVReturnSuccess + 1;
#endif
if (error != kCVReturnSuccess)
return nullptr;
@@ -67,7 +63,7 @@
size_t height = CVPixelBufferGetHeight(image);
if (kCVReturnSuccess != CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_cache.get(), image, nullptr, outputTarget, internalFormat, width, height, format, type, level, &bareVideoTexture))
return nullptr;
-#elif USE(OPENGL)
+#else
UNUSED_PARAM(outputTarget);
UNUSED_PARAM(level);
UNUSED_PARAM(internalFormat);
@@ -75,15 +71,6 @@
UNUSED_PARAM(type);
if (kCVReturnSuccess != CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_cache.get(), image, nullptr, &bareVideoTexture))
return nullptr;
-#elif USE(ANGLE)
- // FIXME: figure out how to do this integrating via ANGLE.
- UNUSED_PARAM(image);
- UNUSED_PARAM(outputTarget);
- UNUSED_PARAM(level);
- UNUSED_PARAM(internalFormat);
- UNUSED_PARAM(format);
- UNUSED_PARAM(type);
- return nullptr;
#endif
RetainPtr<TextureType> videoTexture = adoptCF(bareVideoTexture);
Modified: trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -403,62 +403,62 @@
static NeverDestroyed<StringMap> map;
if (map.get().empty()) {
StringMap stringMap;
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE_ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R16F));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R32F));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R8UI));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R8I));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R16UI));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R16I));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R32UI));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::R32I));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG16F));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG32F));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG8UI));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG8I));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG16UI));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG16I));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG32UI));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG32I));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::SRGB8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::SRGB8_ALPHA8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA4));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB10_A2));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_COMPONENT16));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_COMPONENT24));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_COMPONENT32F));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH24_STENCIL8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH32F_STENCIL8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGB));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RGBA));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE_ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::LUMINANCE));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RED));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::RG_INTEGER));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::DEPTH_STENCIL));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_BYTE));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT_5_6_5));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT_4_4_4_4));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT_5_5_5_1));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::BYTE));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::HALF_FLOAT));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::FLOAT));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_SHORT));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::SHORT));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_INT));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::INT));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_INT_2_10_10_10_REV));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::UNSIGNED_INT_24_8));
- map.get().emplace(STRINGIFY_PAIR(GraphicsContext3D::FLOAT_32_UNSIGNED_INT_24_8_REV));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
+ map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_R8));
+ map.get().emplace(STRINGIFY_PAIR(GL_R16F));
+ map.get().emplace(STRINGIFY_PAIR(GL_R32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_R8UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_R8I));
+ map.get().emplace(STRINGIFY_PAIR(GL_R16UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_R16I));
+ map.get().emplace(STRINGIFY_PAIR(GL_R32UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_R32I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG16F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG16UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG16I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG32UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG32I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB8));
+ map.get().emplace(STRINGIFY_PAIR(GL_SRGB8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA8));
+ map.get().emplace(STRINGIFY_PAIR(GL_SRGB8_ALPHA8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA4));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB10_A2));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT16));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT24));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH24_STENCIL8));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH32F_STENCIL8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
+ map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_RED));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG_INTEGER));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_STENCIL));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_BYTE));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_6_5));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_4_4_4_4));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_5_5_1));
+ map.get().emplace(STRINGIFY_PAIR(GL_BYTE));
+ map.get().emplace(STRINGIFY_PAIR(GL_HALF_FLOAT));
+ map.get().emplace(STRINGIFY_PAIR(GL_FLOAT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT));
+ map.get().emplace(STRINGIFY_PAIR(GL_SHORT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT));
+ map.get().emplace(STRINGIFY_PAIR(GL_INT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_2_10_10_10_REV));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_24_8));
+ map.get().emplace(STRINGIFY_PAIR(GL_FLOAT_32_UNSIGNED_INT_24_8_REV));
#if USE(OPENGL_ES)
map.get().emplace(STRINGIFY_PAIR(GL_RED_INTEGER));
@@ -530,13 +530,8 @@
#if USE(OPENGL_ES)
fragmentShaderSource.appendLiteral("precision mediump float;\n");
fragmentShaderSource.appendLiteral("uniform sampler2D u_texture;\n");
-#elif USE(OPENGL)
+#else
fragmentShaderSource.appendLiteral("uniform sampler2DRect u_texture;\n");
-#elif USE(ANGLE)
- // FIXME: determine how to access rectangular textures via ANGLE.
- ASSERT_NOT_REACHED();
-#else
-#error Unsupported configuration
#endif
fragmentShaderSource.appendLiteral("varying vec2 v_texturePosition;\n");
fragmentShaderSource.appendLiteral("uniform int u_premultiply;\n");
@@ -546,13 +541,8 @@
fragmentShaderSource.appendLiteral(" vec2 texPos = vec2(v_texturePosition.x * u_textureDimensions.x, v_texturePosition.y * u_textureDimensions.y);\n");
#if USE(OPENGL_ES)
fragmentShaderSource.appendLiteral(" vec4 color = texture2D(u_texture, texPos);\n");
-#elif USE(OPENGL)
+#else
fragmentShaderSource.appendLiteral(" vec4 color = texture2DRect(u_texture, texPos);\n");
-#elif USE(ANGLE)
- // FIXME: determine how to access rectangular textures via ANGLE.
- ASSERT_NOT_REACHED();
-#else
-#error Unsupported configuration
#endif
fragmentShaderSource.appendLiteral(" if (u_swapColorChannels == 1) {\n");
fragmentShaderSource.appendLiteral(" color.rgba = color.bgra;\n");
@@ -633,13 +623,9 @@
#if USE(OPENGL_ES)
" v_yTextureCoordinate = normalizedPosition;\n"
" v_uvTextureCoordinate = normalizedPosition;\n"
-#elif USE(OPENGL)
+#else
" v_yTextureCoordinate = normalizedPosition * u_yTextureSize;\n"
" v_uvTextureCoordinate = normalizedPosition * u_uvTextureSize;\n"
-#elif USE(ANGLE)
- // FIXME: determine how to access rectangular textures via ANGLE.
-#else
-#error Unsupported configuration
#endif
"}\n"_s
};
@@ -661,13 +647,9 @@
"precision mediump float;\n"
"#define SAMPLERTYPE sampler2D\n"
"#define TEXTUREFUNC texture2D\n"
-#elif USE(OPENGL)
+#else
"#define SAMPLERTYPE sampler2DRect\n"
"#define TEXTUREFUNC texture2DRect\n"
-#elif USE(ANGLE)
- // FIXME: determine how to access rectangular textures via ANGLE.
-#else
-#error Unsupported configuration
#endif
"uniform SAMPLERTYPE u_yTexture;\n"
"uniform SAMPLERTYPE u_uvTexture;\n"
@@ -808,13 +790,8 @@
#if USE(OPENGL_ES)
GC3Denum videoTextureTarget = GraphicsContext3D::TEXTURE_2D;
-#elif USE(OPENGL)
+#else
GC3Denum videoTextureTarget = GL_TEXTURE_RECTANGLE_ARB;
-#elif USE(ANGLE)
- // FIXME: determine how to access rectangular textures via ANGLE.
- GC3Denum videoTextureTarget = GraphicsContext3D::TEXTURE_2D;
-#else
-#error Unsupported configuration
#endif
auto uvTexture = m_context->createTexture();
m_context->activeTexture(GraphicsContext3D::TEXTURE1);
@@ -823,7 +800,7 @@
m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
- if (!m_context->texImageIOSurface2D(videoTextureTarget, GraphicsContext3D::RG, uvPlaneWidth, uvPlaneHeight, GraphicsContext3D::RG, GraphicsContext3D::UNSIGNED_BYTE, surface, 1)) {
+ if (!m_context->texImageIOSurface2D(videoTextureTarget, GL_RG, uvPlaneWidth, uvPlaneHeight, GL_RG, GL_UNSIGNED_BYTE, surface, 1)) {
m_context->deleteTexture(uvTexture);
return false;
}
@@ -835,7 +812,7 @@
m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
m_context->texParameteri(videoTextureTarget, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
- if (!m_context->texImageIOSurface2D(videoTextureTarget, GraphicsContext3D::LUMINANCE, yPlaneWidth, yPlaneHeight, GraphicsContext3D::LUMINANCE, GraphicsContext3D::UNSIGNED_BYTE, surface, 0)) {
+ if (!m_context->texImageIOSurface2D(videoTextureTarget, GL_LUMINANCE, yPlaneWidth, yPlaneHeight, GL_LUMINANCE, GL_UNSIGNED_BYTE, surface, 0)) {
m_context->deleteTexture(yTexture);
m_context->deleteTexture(uvTexture);
return false;
@@ -890,16 +867,10 @@
Platform3DObject videoTextureName = CVOpenGLESTextureGetName(inputVideoTexture);
GC3Denum videoTextureTarget = CVOpenGLESTextureGetTarget(inputVideoTexture);
CVOpenGLESTextureGetCleanTexCoords(inputVideoTexture, lowerLeft, lowerRight, upperRight, upperLeft);
-#elif USE(OPENGL)
+#else
Platform3DObject videoTextureName = CVOpenGLTextureGetName(inputVideoTexture);
GC3Denum videoTextureTarget = CVOpenGLTextureGetTarget(inputVideoTexture);
CVOpenGLTextureGetCleanTexCoords(inputVideoTexture, lowerLeft, lowerRight, upperRight, upperLeft);
-#elif USE(ANGLE)
- Platform3DObject videoTextureName = CVOpenGLTextureGetName(inputVideoTexture);
- GC3Denum videoTextureTarget = CVOpenGLTextureGetTarget(inputVideoTexture);
- CVOpenGLTextureGetCleanTexCoords(inputVideoTexture, lowerLeft, lowerRight, upperRight, upperLeft);
- // FIXME: determine how to access rectangular textures via ANGLE.
- ASSERT_NOT_REACHED();
#endif
if (lowerLeft[1] < upperRight[1])
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
+#if ENABLE(GRAPHICS_CONTEXT_3D)
#include "Extensions3DOpenGL.h"
@@ -308,4 +308,4 @@
} // namespace WebCore
-#endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
+#endif // ENABLE(GRAPHICS_CONTEXT_3D)
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -26,7 +26,7 @@
#include "config.h"
-#if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
+#if ENABLE(GRAPHICS_CONTEXT_3D)
#include "Extensions3DOpenGLCommon.h"
#include "ANGLEWebKitBridge.h"
@@ -256,4 +256,4 @@
} // namespace WebCore
-#endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
+#endif // ENABLE(GRAPHICS_CONTEXT_3D)
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -26,7 +26,7 @@
#include "config.h"
-#if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
+#if ENABLE(GRAPHICS_CONTEXT_3D)
#include "GraphicsContext3D.h"
@@ -503,4 +503,4 @@
}
-#endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || (PLATFORM(COCOA) && USE(OPENGL_ES)))
+#endif // ENABLE(GRAPHICS_CONTEXT_3D)
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -28,7 +28,7 @@
#include "config.h"
-#if ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
+#if ENABLE(GRAPHICS_CONTEXT_3D)
#include "GraphicsContext3D.h"
#if PLATFORM(IOS_FAMILY)
@@ -2079,4 +2079,4 @@
}
-#endif // ENABLE(GRAPHICS_CONTEXT_3D) && (USE(OPENGL) || USE(OPENGL_ES))
+#endif // ENABLE(GRAPHICS_CONTEXT_3D)
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (246511 => 246512)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2019-06-17 20:14:05 UTC (rev 246511)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2019-06-17 20:23:46 UTC (rev 246512)
@@ -28,7 +28,7 @@
#include "config.h"
-#if ENABLE(GRAPHICS_CONTEXT_3D) && USE(OPENGL_ES) && !PLATFORM(IOS_FAMILY)
+#if ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS_FAMILY)
#include "GraphicsContext3D.h"
@@ -400,4 +400,4 @@
}
-#endif // ENABLE(GRAPHICS_CONTEXT_3D) && USE(OPENGL_ES) && !PLATFORM(IOS_FAMILY)
+#endif // ENABLE(GRAPHICS_CONTEXT_3D) && !PLATFORM(IOS_FAMILY)
