Title: [287143] trunk/Source/ThirdParty/ANGLE
- Revision
- 287143
- Author
- commit-qu...@webkit.org
- Date
- 2021-12-16 09:51:47 -0800 (Thu, 16 Dec 2021)
Log Message
Add support to attribute ownership of ANGLE Metal's resources
https://bugs.webkit.org/show_bug.cgi?id=233941
Patch by John Cunningham <johncunning...@apple.com> on 2021-12-16
Reviewed by Kimmo Kinnunen.
Add SPI to mtl_resource_spi.h to attribute memory to another task.
* Configurations/ANGLE-dynamic.xcconfig:
* Configurations/ANGLE-static.xcconfig:
* src/libANGLE/renderer/metal/mtl_resource_spi.h:
(rx::mtl::setOwnerWithIdentity):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287142 => 287143)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-16 17:36:20 UTC (rev 287142)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-16 17:51:47 UTC (rev 287143)
@@ -1,3 +1,17 @@
+2021-12-16 John Cunningham <johncunning...@apple.com>
+
+ Add support to attribute ownership of ANGLE Metal's resources
+ https://bugs.webkit.org/show_bug.cgi?id=233941
+
+ Reviewed by Kimmo Kinnunen.
+
+ Add SPI to mtl_resource_spi.h to attribute memory to another task.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+ * Configurations/ANGLE-static.xcconfig:
+ * src/libANGLE/renderer/metal/mtl_resource_spi.h:
+ (rx::mtl::setOwnerWithIdentity):
+
2021-12-16 Michael Saboff <msab...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=234173
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287142 => 287143)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-16 17:36:20 UTC (rev 287142)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-16 17:51:47 UTC (rev 287143)
@@ -44,9 +44,9 @@
PUBLIC_HEADERS_FOLDER_PATH_macosx = $(ANGLE_HEADERS_FOLDER_PATH);
PUBLIC_HEADERS_FOLDER_PATH_maccatalyst = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(ANGLE_HEADERS_FOLDER_PATH);
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY;
-GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_OPENGL_DESKTOP
+GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_OPENGL_DESKTOP ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY
DEAD_CODE_STRIPPING = YES;
DEAD_CODE_STRIPPING[config=Debug] = NO;
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig (287142 => 287143)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig 2021-12-16 17:36:20 UTC (rev 287142)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig 2021-12-16 17:51:47 UTC (rev 287143)
@@ -22,9 +22,9 @@
PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_METAL_XCODE_BUILDS_SHADERS;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY;
-GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]= $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_OPENGL_DESKTOP
+GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]= $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_OPENGL_DESKTOP ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY
INSTALLHDRS_SCRIPT_PHASE = YES;
USE_HEADERMAP = NO;
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_resource_spi.h (287142 => 287143)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_resource_spi.h 2021-12-16 17:36:20 UTC (rev 287142)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_resource_spi.h 2021-12-16 17:51:47 UTC (rev 287143)
@@ -1,9 +1,63 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
//
-// Copyright 2021 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
// mtl_resource_spi.h:
-// Used to set Metal resource ownership identity with SPI.
-// Purposefully empty header file. Actual implementation will be hosted in WebKit.
+// Used to set Metal resource ownership identity with SPI
//
+
+#ifndef LIBANGLE_RENDERER_METAL_RESOURCE_SPI_H_
+#define LIBANGLE_RENDERER_METAL_RESOURCE_SPI_H_
+
+#import "common/apple/apple_platform.h"
+
+#if ANGLE_USE_METAL_OWNERSHIP_IDENTITY
+
+# import <Metal/MTLResource_Private.h>
+# import <Metal/Metal.h>
+# import <mach/mach_types.h>
+
+namespace rx
+{
+namespace mtl
+{
+inline void setOwnerWithIdentity(id<MTLResource> resource, task_id_token_t identityToken)
+{
+ if (identityToken != TASK_ID_TOKEN_NULL)
+ {
+ kern_return_t kr = [(id<MTLResourceSPI>)resource setOwnerWithIdentity:identityToken];
+ if (ANGLE_UNLIKELY(kr != KERN_SUCCESS))
+ {
+ ERR() << "setOwnerWithIdentity failed with: %s (%x)" << mach_error_string(kr) << kr;
+ ASSERT(false);
+ }
+ }
+ return;
+}
+}
+}
+#endif
+
+#endif /* LIBANGLE_RENDERER_METAL_RESOURCE_SPI_H_ */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
