[webkit-changes] [WebKit/WebKit] e3bf17: Merge WebGL2 enablement flag with WebGL flag

Wed Feb 1 09:33:33 PST 2023

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: e3bf17995e0543582de0d43c9b8429ba2716eb2e
      https://github.com/WebKit/WebKit/commit/e3bf17995e0543582de0d43c9b8429ba2716eb2e
  Author: Brent Fulgham <bfulgham at webkit.org>
  Date:   2023-02-01 (Wed, 01 Feb 2023)

  Changed paths:
    M LayoutTests/fast/canvas/webgl/buffer-data-subdata-dynamic-buffer.html
    M LayoutTests/fast/canvas/webgl/bufferData-offset-length.html
    M LayoutTests/fast/canvas/webgl/copyBufferSubData.html
    M LayoutTests/fast/canvas/webgl/getBufferSubData-webgl1.html
    M LayoutTests/fast/canvas/webgl/webgl2-buffer-targets.html
    M LayoutTests/fast/canvas/webgl/webgl2-buffers.html
    M LayoutTests/fast/canvas/webgl/webgl2-context-creation.html
    M LayoutTests/fast/canvas/webgl/webgl2-getActiveUniforms.html
    M LayoutTests/fast/canvas/webgl/webgl2-getbuffersubdata.html
    M LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile.html
    M LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html
    M LayoutTests/fast/canvas/webgl/webgl2-texStorage.html
    M LayoutTests/fast/canvas/webgl/webgl2-texture-upload-enums.html
    M LayoutTests/fast/canvas/webgl/webgl2/bindings.html
    M LayoutTests/fast/canvas/webgl/webgl2/constants.html
    M LayoutTests/fast/canvas/webgl/webgl2/sequences.html
    M LayoutTests/inspector/canvas/create-context-webgl2.html
    M LayoutTests/inspector/canvas/recording-webgl2-snapshots.html
    M LayoutTests/inspector/canvas/requestContent-webgl2.html
    M LayoutTests/inspector/canvas/resolveContext-webgl2.html
    M LayoutTests/inspector/canvas/resources/recording-webgl2.js
    M LayoutTests/inspector/canvas/shaderProgram-add-remove-webgl2.html
    M Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
    M Source/WTF/wtf/PlatformEnable.h
    M Source/WTF/wtf/PlatformEnableCocoa.h
    M Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp
    M Source/WebCore/Modules/webxr/WebXRWebGLLayer.cpp
    M Source/WebCore/Modules/webxr/WebXRWebGLLayer.h
    M Source/WebCore/Modules/webxr/WebXRWebGLLayer.idl
    M Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp
    M Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp
    M Source/WebCore/dom/Document.cpp
    M Source/WebCore/dom/Document.h
    M Source/WebCore/dom/Document.idl
    M Source/WebCore/html/HTMLCanvasElement.cpp
    M Source/WebCore/html/HTMLCanvasElement.idl
    M Source/WebCore/html/OffscreenCanvas.cpp
    M Source/WebCore/html/OffscreenCanvas.h
    M Source/WebCore/html/OffscreenCanvas.idl
    M Source/WebCore/html/canvas/WebGL2RenderingContext.cpp
    M Source/WebCore/html/canvas/WebGL2RenderingContext.h
    M Source/WebCore/html/canvas/WebGL2RenderingContext.idl
    M Source/WebCore/html/canvas/WebGLAny.h
    M Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
    M Source/WebCore/html/canvas/WebGLRenderingContextBase.h
    M Source/WebCore/html/canvas/WebGLTransformFeedback.cpp
    M Source/WebCore/html/canvas/WebGLTransformFeedback.h
    M Source/WebCore/html/canvas/WebGLTransformFeedback.idl
    M Source/WebCore/html/canvas/WebGLVertexArrayObject.cpp
    M Source/WebCore/html/canvas/WebGLVertexArrayObject.h
    M Source/WebCore/html/canvas/WebGLVertexArrayObject.idl
    M Source/WebCore/inspector/InspectorCanvas.cpp
    M Source/WebCore/inspector/InspectorCanvasCallTracer.h
    M Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
    M Source/WebCore/page/PageConsoleClient.cpp
    M Source/WebCore/platform/graphics/GraphicsContextGLAttributes.h
    M Source/WebCore/platform/graphics/gbm/GraphicsContextGLFallback.cpp
    M Source/WebCore/platform/graphics/gbm/GraphicsContextGLGBM.cpp
    M Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp
    M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
    M Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp
    M Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
    M Source/WebKitLegacy/mac/WebView/WebPreferences.mm
    M Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
    M Source/cmake/OptionsGTK.cmake
    M Source/cmake/OptionsMac.cmake
    M Source/cmake/OptionsWPE.cmake
    M Source/cmake/OptionsWin.cmake
    M Source/cmake/WebKitFeatures.cmake
    M Tools/DumpRenderTree/win/DumpRenderTree.cpp
    M Tools/Scripts/webkitperl/FeatureList.pm

  Log Message:
  -----------
  Merge WebGL2 enablement flag with WebGL flag
https://bugs.webkit.org/show_bug.cgi?id=248667
<rdar://problem/102910963>

Reviewed by Kimmo Kinnunen.

We've been shipping WebGL2 for many years, and no longer need a separate WebGL2 flag. Instead, we
should merge the WebGL2 enablement flag (and compile guards) with the higher-level WebGL feature.

* LayoutTests/fast/canvas/webgl/buffer-data-subdata-dynamic-buffer.html: No need to enable WebGL2 explicitly.
* LayoutTests/fast/canvas/webgl/bufferData-offset-length.html: Ditto.
* LayoutTests/fast/canvas/webgl/copyBufferSubData.html: Ditto.
* LayoutTests/fast/canvas/webgl/getBufferSubData-webgl1.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-buffer-targets.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-buffers.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-context-creation.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-getActiveUniforms.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-getbuffersubdata.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-runtime-flag.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-texStorage.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2-texture-upload-enums.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2/bindings.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2/constants.html: Ditto.
* LayoutTests/fast/canvas/webgl/webgl2/sequences.html: Ditto.
* LayoutTests/inspector/canvas/create-context-webgl2.html: Ditto.
* LayoutTests/inspector/canvas/recording-webgl2-snapshots.html: Ditto.
* LayoutTests/inspector/canvas/requestContent-webgl2.html: Ditto.
* LayoutTests/inspector/canvas/resolveContext-webgl2.html: Ditto.
* LayoutTests/inspector/canvas/resources/recording-webgl2.js: Ditto.
* LayoutTests/inspector/canvas/shaderProgram-add-remove-webgl2.html: Ditto.
* Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: Remove WebGL2 flag.
* Source/WTF/wtf/PlatformEnable.h: Ditto.
* Source/WTF/wtf/PlatformEnableCocoa.h: Ditto.
* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp: Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/Modules/webxr/WebXRWebGLLayer.cpp: Ditto.
* Source/WebCore/Modules/webxr/WebXRWebGLLayer.h: Ditto.
* Source/WebCore/Modules/webxr/WebXRWebGLLayer.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp:
(WebCore::convertToJSValue): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp:
* Source/WebCore/dom/Document.cpp:
(WebCore::Document::getCSSCanvasContext): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/dom/Document.h:
* Source/WebCore/dom/Document.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
(WebCore::HTMLCanvasElement::isWebGLType): Ditto.
(WebCore::HTMLCanvasElement::toWebGLVersion): Ditto.
* Source/WebCore/html/HTMLCanvasElement.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/html/OffscreenCanvas.cpp:
(WebCore::OffscreenCanvas::createContextWebGL): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
(WebCore::OffscreenCanvas::getContext): Ditto.
* Source/WebCore/html/OffscreenCanvas.h:
* Source/WebCore/html/OffscreenCanvas.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/html/canvas/WebGL2RenderingContext.cpp: Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/html/canvas/WebGL2RenderingContext.h: Ditto.
* Source/WebCore/html/canvas/WebGL2RenderingContext.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/html/canvas/WebGLAny.h:
* Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::create): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
(WebCore::WebGLRenderingContextBase::getBufferParameter): Ditto.
(WebCore::WebGLRenderingContextBase::getProgramParameter): Ditto.
(WebCore::WebGLRenderingContextBase::validateTexFuncFormatAndType): Ditto.
(WebCore::WebGLRenderingContextBase::useProgram): Ditto.
* Source/WebCore/html/canvas/WebGLRenderingContextBase.h:
* Source/WebCore/html/canvas/WebGLTransformFeedback.cpp: Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/html/canvas/WebGLTransformFeedback.h: Ditto.
* Source/WebCore/html/canvas/WebGLTransformFeedback.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/html/canvas/WebGLVertexArrayObject.cpp: Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/html/canvas/WebGLVertexArrayObject.h: Ditto.
* Source/WebCore/html/canvas/WebGLVertexArrayObject.idl: Switch enablement from WebGL2 to WebGL.
* Source/WebCore/inspector/InspectorCanvas.cpp:
(WebCore::InspectorCanvas::resolveContext const): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
(WebCore::shouldSnapshotWebGLAction): Ditto.
(WebCore::InspectorCanvas::recordAction): Ditto.
(WebCore::InspectorCanvas::buildObjectForCanvas): Ditto.
(WebCore::InspectorCanvas::releaseObjectForRecording): Ditto.
* Source/WebCore/inspector/InspectorCanvasCallTracer.h:
* Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp:
(WebCore::InspectorCanvasAgent::startRecording): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/page/PageConsoleClient.cpp: Ditto.
(WebCore::canvasRenderingContext): Ditto.
* Source/WebCore/platform/graphics/GraphicsContextGLAttributes.h:
* Source/WebCore/platform/graphics/gbm/GraphicsContextGLFallback.cpp:
(WebCore::GraphicsContextGLFallback::platformInitializeContext): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/platform/graphics/gbm/GraphicsContextGLGBM.cpp:
(WebCore::GraphicsContextGLGBM::platformInitializeContext): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:
(WebCore::GraphicsContextGLTextureMapperANGLE::platformInitializeContext): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
(WebCore::GraphicsContextGLTextureMapperANGLE::platformInitialize): Ditto.
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: Ditto.
* Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp:
(WebKit::RemoteGraphicsContextGLProxy::isGLES2Compliant const): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebKit/WebProcess/Inspector/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::enableFrontendFeatures): Move ENABLE(WEBGL2) code into ENABLE(WEBGL) block.
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::adjustSettingsForLockdownMode): Remove reference to WebGL2 feature flag.
* Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h:
* Source/WebKitLegacy/mac/WebView/WebPreferences.mm:
(-[WebPreferences webGL2Enabled]): Replace with stub.
(-[WebPreferences setWebGL2Enabled:]): Ditto.
* Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h:
* Source/cmake/OptionsGTK.cmake: Remove WEBGL2 macro enablement.
* Source/cmake/OptionsMac.cmake: Ditto.
* Source/cmake/OptionsWPE.cmake: Ditto.
* Source/cmake/OptionsWin.cmake: Ditto.
* Source/cmake/WebKitFeatures.cmake: Ditto.
* Tools/DumpRenderTree/win/DumpRenderTree.cpp:
(enableExperimentalFeatures):
* Tools/Scripts/webkitperl/FeatureList.pm:

Canonical link: https://commits.webkit.org/259690@main