Title: [293097] branches/safari-614.1.10-branch/Source/WebGPU
- Revision
- 293097
- Author
- [email protected]
- Date
- 2022-04-20 09:03:21 -0700 (Wed, 20 Apr 2022)
Log Message
Cherry-pick r292760. rdar://problem/91351306
[WebGPU] Fix the tvOS build (again)
https://bugs.webkit.org/show_bug.cgi?id=239106
<rdar://problem/91351306>
Unreviewed.
Turns out PLATFORM(APPLETV) and PLATFORM(TVOS) are different things.
* WebGPU/Texture.mm:
(WebGPU::Device::createTexture):
(WebGPU::Texture::createView):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292760 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.10-branch/Source/WebGPU/ChangeLog (293096 => 293097)
--- branches/safari-614.1.10-branch/Source/WebGPU/ChangeLog 2022-04-20 15:56:59 UTC (rev 293096)
+++ branches/safari-614.1.10-branch/Source/WebGPU/ChangeLog 2022-04-20 16:03:21 UTC (rev 293097)
@@ -1,3 +1,35 @@
+2022-04-20 Russell Epstein <[email protected]>
+
+ Cherry-pick r292760. rdar://problem/91351306
+
+ [WebGPU] Fix the tvOS build (again)
+ https://bugs.webkit.org/show_bug.cgi?id=239106
+ <rdar://problem/91351306>
+
+ Unreviewed.
+
+ Turns out PLATFORM(APPLETV) and PLATFORM(TVOS) are different things.
+
+ * WebGPU/Texture.mm:
+ (WebGPU::Device::createTexture):
+ (WebGPU::Texture::createView):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292760 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-11 Myles C. Maxfield <[email protected]>
+
+ [WebGPU] Fix the tvOS build (again)
+ https://bugs.webkit.org/show_bug.cgi?id=239106
+ <rdar://problem/91351306>
+
+ Unreviewed.
+
+ Turns out PLATFORM(APPLETV) and PLATFORM(TVOS) are different things.
+
+ * WebGPU/Texture.mm:
+ (WebGPU::Device::createTexture):
+ (WebGPU::Texture::createView):
+
2022-04-08 Myles C. Maxfield <[email protected]>
[WebGPU] Fix the release build
Modified: branches/safari-614.1.10-branch/Source/WebGPU/WebGPU/Texture.mm (293096 => 293097)
--- branches/safari-614.1.10-branch/Source/WebGPU/WebGPU/Texture.mm 2022-04-20 15:56:59 UTC (rev 293096)
+++ branches/safari-614.1.10-branch/Source/WebGPU/WebGPU/Texture.mm 2022-04-20 16:03:21 UTC (rev 293097)
@@ -2008,7 +2008,7 @@
if (descriptor.size.depthOrArrayLayers > 1) {
textureDescriptor.arrayLength = descriptor.size.depthOrArrayLayers;
if (descriptor.sampleCount > 1) {
-#if PLATFORM(WATCHOS) || PLATFORM(TVOS)
+#if PLATFORM(WATCHOS) || PLATFORM(APPLETV)
return Texture::createInvalid(*this);
#else
textureDescriptor.textureType = MTLTextureType2DMultisampleArray;
@@ -2307,7 +2307,7 @@
break;
case WGPUTextureViewDimension_2DArray:
if (m_descriptor.sampleCount > 1) {
-#if PLATFORM(WATCHOS) || PLATFORM(TVOS)
+#if PLATFORM(WATCHOS) || PLATFORM(APPLETV)
return TextureView::createInvalid(m_device);
#else
textureType = MTLTextureType2DMultisampleArray;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
