Title: [292491] branches/safari-614.1.9-branch/Source/WebGPU
- Revision
- 292491
- Author
- repst...@apple.com
- Date
- 2022-04-06 12:32:44 -0700 (Wed, 06 Apr 2022)
Log Message
Cherry-pick r292479. rdar://problem/91351306
[WebGPU] Fix the tvOS build
https://bugs.webkit.org/show_bug.cgi?id=238881
<rdar://problem/91351306>
Unreviewed.
MTLTextureType2DMultisampleArray is not available on tvOS.
* WebGPU/Texture.mm:
(WebGPU::Device::createTexture):
(WebGPU::Texture::createView):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.9-branch/Source/WebGPU/ChangeLog (292490 => 292491)
--- branches/safari-614.1.9-branch/Source/WebGPU/ChangeLog 2022-04-06 19:13:00 UTC (rev 292490)
+++ branches/safari-614.1.9-branch/Source/WebGPU/ChangeLog 2022-04-06 19:32:44 UTC (rev 292491)
@@ -1,3 +1,35 @@
+2022-04-06 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r292479. rdar://problem/91351306
+
+ [WebGPU] Fix the tvOS build
+ https://bugs.webkit.org/show_bug.cgi?id=238881
+ <rdar://problem/91351306>
+
+ Unreviewed.
+
+ MTLTextureType2DMultisampleArray is not available on tvOS.
+
+ * WebGPU/Texture.mm:
+ (WebGPU::Device::createTexture):
+ (WebGPU::Texture::createView):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-06 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [WebGPU] Fix the tvOS build
+ https://bugs.webkit.org/show_bug.cgi?id=238881
+ <rdar://problem/91351306>
+
+ Unreviewed.
+
+ MTLTextureType2DMultisampleArray is not available on tvOS.
+
+ * WebGPU/Texture.mm:
+ (WebGPU::Device::createTexture):
+ (WebGPU::Texture::createView):
+
2022-04-01 Michael Saboff <msab...@apple.com>
Stop copying StagedFrameworks to the secondary path by default
Modified: branches/safari-614.1.9-branch/Source/WebGPU/WebGPU/Texture.mm (292490 => 292491)
--- branches/safari-614.1.9-branch/Source/WebGPU/WebGPU/Texture.mm 2022-04-06 19:13:00 UTC (rev 292490)
+++ branches/safari-614.1.9-branch/Source/WebGPU/WebGPU/Texture.mm 2022-04-06 19:32:44 UTC (rev 292491)
@@ -1896,7 +1896,7 @@
if (descriptor.size.depthOrArrayLayers > 1) {
textureDescriptor.arrayLength = descriptor.size.depthOrArrayLayers;
if (descriptor.sampleCount > 1) {
-#if PLATFORM(WATCHOS)
+#if PLATFORM(WATCHOS) || PLATFORM(TVOS)
return nullptr;
#else
textureDescriptor.textureType = MTLTextureType2DMultisampleArray;
@@ -2244,7 +2244,7 @@
break;
case WGPUTextureViewDimension_2DArray:
if (m_descriptor.sampleCount > 1) {
-#if PLATFORM(WATCHOS)
+#if PLATFORM(WATCHOS) || PLATFORM(TVOS)
return nullptr;
#else
textureType = MTLTextureType2DMultisampleArray;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
