Attachment 342343 Details for Bug 186449 – Patch

[patch] Patch

bug-186449-20180609092213.patch (text/plain), 2.02 KB, created by Dean Jackson on 2018-06-08 16:22:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2018-06-08 16:22:14 PDT

Size: 2.02 KB

patch

obsolete

>Subversion Revision: 232551
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2eaf26552cd3ebcd4ab72ca4b27c3ac82b8e6e93..203718deb27321e7b3d67f44b996d9b171e81e5a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-08  Dean Jackson  <dino@apple.com>
>+
>+        'setRenderPipelineState:' is unavailable: not available on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=186449
>+        <rdar://problem/40880602>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-06  Antoine Quint  <graouts@apple.com>
> 
>         Use the default label for snapshotted plug-ins if no mime-type is available
>diff --git a/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm b/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm
>index ff660588036354b03c2be56e2633e6110d61a4e0..23cb1aab3e8970e6fcfeae40327984d36cc6bf2b 100644
>--- a/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/GPURenderCommandEncoderMetal.mm
>@@ -54,7 +54,9 @@ void GPURenderCommandEncoder::setRenderPipelineState(GPURenderPipelineState* ren
>     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)

Flags:

simon.fraser: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186449: 342343