6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-15 14:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Attempts to ensure initial finalised line texture state.

Browse Source 
This was an attempt to remove the vertical line on the left of a composite display. Obviously the cause is not as suspected.
This commit is contained in:
Thomas Harte
2020-09-09 13:15:21 -04:00
parent 3d392dd81d
commit e7ce03c418
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm
View File

@@ -472,6 +472,16 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
NSString *const kernelFunction = [self shouldApplyGamma] ? @"filterChromaKernelWithGamma" : @"filterChromaKernelNoGamma"; NSString *const kernelFunction = [self shouldApplyGamma] ? @"filterChromaKernelWithGamma" : @"filterChromaKernelNoGamma";
_finalisedLineState = [_view.device newComputePipelineStateWithFunction:[library newFunctionWithName:kernelFunction] error:nil]; _finalisedLineState = [_view.device newComputePipelineStateWithFunction:[library newFunctionWithName:kernelFunction] error:nil];
// Ensure finalised line texture is initially clear.
id<MTLComputePipelineState> clearPipeline = [_view.device newComputePipelineStateWithFunction:[library newFunctionWithName:@"clearKernel"] error:nil];
id<MTLCommandBuffer> commandBuffer = [_commandQueue commandBuffer];
id<MTLComputeCommandEncoder> computeEncoder = [commandBuffer computeCommandEncoder];
[self dispatchComputeCommandEncoder:computeEncoder pipelineState:clearPipeline width:lineTextureDescriptor.width height:lineTextureDescriptor.height offsetBuffer:[self bufferForOffset:0]];
[computeEncoder endEncoding];
[commandBuffer commit];
} }
// A luma separation texture will exist only for composite colour. // A luma separation texture will exist only for composite colour.
@@ -519,19 +529,10 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
// //
uniforms()->scale[0] = modals.output_scale.x; uniforms()->scale[0] = modals.output_scale.x;
uniforms()->scale[1] = modals.output_scale.y; uniforms()->scale[1] = modals.output_scale.y;
uniforms()->lineWidth = 1.05f / modals.expected_vertical_lines; // TODO: return to 1.0 (or slightly more), once happy. uniforms()->lineWidth = 1.05f / modals.expected_vertical_lines;
[self setAspectRatio]; [self setAspectRatio];
const auto toRGB = to_rgb_matrix(modals.composite_colour_space); const auto toRGB = to_rgb_matrix(modals.composite_colour_space);
// uniforms()->toRGB[0] = toRGB[0];
// uniforms()->toRGB[1] = toRGB[1];
// uniforms()->toRGB[2] = toRGB[2];
// uniforms()->toRGB[4] = toRGB[3];
// uniforms()->toRGB[5] = toRGB[4];
// uniforms()->toRGB[6] = toRGB[5];
// uniforms()->toRGB[8] = toRGB[6];
// uniforms()->toRGB[9] = toRGB[7];
// uniforms()->toRGB[10] = toRGB[8];
uniforms()->toRGB = simd::float3x3( uniforms()->toRGB = simd::float3x3(
simd::float3{toRGB[0], toRGB[1], toRGB[2]}, simd::float3{toRGB[0], toRGB[1], toRGB[2]},
simd::float3{toRGB[3], toRGB[4], toRGB[5]}, simd::float3{toRGB[3], toRGB[4], toRGB[5]},

5
OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal
View File

@@ -556,3 +556,8 @@ kernel void separateLumaKernel5( texture2d<half, access::read> inTexture [[textu
return setSeparatedLumaChroma(luminance, centreSample, outTexture, gid, offset); return setSeparatedLumaChroma(luminance, centreSample, outTexture, gid, offset);
} }
kernel void clearKernel( texture2d<half, access::write> outTexture [[texture(1)]],
uint2 gid [[thread_position_in_grid]]) {
outTexture.write(half4(0.0f, 0.0f, 0.0f, 1.0f), gid);
}