From 394f6b58d80faec1797d59e78a4e15e4572fa21e Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 9 Dec 2020 20:18:53 -0500 Subject: [PATCH] Ensure `_finalisedLineTexture` really is cleared. --- OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm | 1 + OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm b/OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm index 90a87e55a..8a0a865ff 100644 --- a/OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm +++ b/OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm @@ -499,6 +499,7 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget; id commandBuffer = [_commandQueue commandBuffer]; id computeEncoder = [commandBuffer computeCommandEncoder]; + [computeEncoder setTexture:_finalisedLineTexture atIndex:0]; [self dispatchComputeCommandEncoder:computeEncoder pipelineState:clearPipeline width:lineTextureDescriptor.width height:lineTextureDescriptor.height offsetBuffer:[self bufferForOffset:0]]; [computeEncoder endEncoding]; diff --git a/OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal b/OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal index 40ed7da0b..7fa69016e 100644 --- a/OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal +++ b/OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal @@ -582,7 +582,7 @@ kernel void separateLumaKernel5( texture2d inTexture [[textu return setSeparatedLumaChroma(luminance, centreSample, outTexture, gid, offset); } -kernel void clearKernel( texture2d outTexture [[texture(1)]], +kernel void clearKernel( texture2d outTexture [[texture(0)]], uint2 gid [[thread_position_in_grid]]) { outTexture.write(half4(0.0f, 0.0f, 0.0f, 1.0f), gid); }