Title: [232655] branches/safari-606.1.20-branch/Source/WebCore
- Revision
- 232655
- Author
- [email protected]
- Date
- 2018-06-08 17:13:18 -0700 (Fri, 08 Jun 2018)
Log Message
Cherry-pick r232649. rdar://problem/40880602
'setRenderPipelineState:' is unavailable: not available on iOS
https://bugs.webkit.org/show_bug.cgi?id=186449
<rdar://problem/40880602>
Reviewed by Simon Fraser.
Be more explicit about the protocol type to avoid
the compiler getting confused by a similar signature.
* platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm:
(WebCore::GPURenderCommandEncoder::setRenderPipelineState):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232649 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606.1.20-branch/Source/WebCore/ChangeLog (232654 => 232655)
--- branches/safari-606.1.20-branch/Source/WebCore/ChangeLog 2018-06-09 00:03:31 UTC (rev 232654)
+++ branches/safari-606.1.20-branch/Source/WebCore/ChangeLog 2018-06-09 00:13:18 UTC (rev 232655)
@@ -1,3 +1,35 @@
+2018-06-08 Kocsen Chung <[email protected]>
+
+ Cherry-pick r232649. rdar://problem/40880602
+
+ 'setRenderPipelineState:' is unavailable: not available on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=186449
+ <rdar://problem/40880602>
+
+ Reviewed by Simon Fraser.
+
+ Be more explicit about the protocol type to avoid
+ the compiler getting confused by a similar signature.
+
+ * platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm:
+ (WebCore::GPURenderCommandEncoder::setRenderPipelineState):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232649 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-06-08 Dean Jackson <[email protected]>
+
+ 'setRenderPipelineState:' is unavailable: not available on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=186449
+ <rdar://problem/40880602>
+
+ Reviewed by Simon Fraser.
+
+ Be more explicit about the protocol type to avoid
+ the compiler getting confused by a similar signature.
+
+ * platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm:
+ (WebCore::GPURenderCommandEncoder::setRenderPipelineState):
+
2018-06-07 Kocsen Chung <[email protected]>
Cherry-pick r232563. rdar://problem/40439109
Modified: branches/safari-606.1.20-branch/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm (232654 => 232655)
--- branches/safari-606.1.20-branch/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm 2018-06-09 00:03:31 UTC (rev 232654)
+++ branches/safari-606.1.20-branch/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm 2018-06-09 00:13:18 UTC (rev 232655)
@@ -54,7 +54,9 @@
if (!m_renderCommandEncoder || !renderPipelineState)
return;
- [m_renderCommandEncoder setRenderPipelineState:static_cast<id<MTLRenderPipelineState>>(renderPipelineState->platformRenderPipelineState())];
+ // We need to cast to MTLRenderCommandEncoder explicitly because the compiler gets
+ // confused by a protocol with a similar signature.
+ [(id<MTLRenderCommandEncoder>)m_renderCommandEncoder.get() setRenderPipelineState:static_cast<id<MTLRenderPipelineState>>(renderPipelineState->platformRenderPipelineState())];
}
void GPURenderCommandEncoder::setDepthStencilState(GPUDepthStencilState* depthStencilState)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
