6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-29 16:29:08 +00:00
Code Issues Projects Releases Wiki Activity

Generalises existing scanToDisplay to add lineToDisplay.

Browse Source
This commit is contained in:
Thomas Harte 2020-08-17 21:15:19 -04:00
parent 9da79d2d81
commit 59c4c8233f
1 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,14 @@ struct Uniforms {
float2 offset; float2 offset;
}; };
namespace {
constexpr sampler standardSampler( coord::pixel,
address::clamp_to_edge, // Although arbitrary, stick with this address mode for compatibility all the way to MTLFeatureSet_iOS_GPUFamily1_v1.
filter::nearest);
}
// MARK: - Structs used for receiving data from the emulation. // MARK: - Structs used for receiving data from the emulation.
// This is intended to match the net effect of `Scan` as defined by the BufferingScanTarget. // This is intended to match the net effect of `Scan` as defined by the BufferingScanTarget.
@ -70,22 +78,35 @@ struct SourceInterpolator {
}; };
// MARK: - Scan shaders; these do final output to the display. // MARK: - Vertex shaders.
vertex SourceInterpolator scanToDisplay( constant Uniforms &uniforms [[buffer(1)]], float2 textureLocation(constant Line *line, float offset) {
constant Scan *scans [[buffer(0)]], return float2(
uint instanceID [[instance_id]], mix(line->endPoints[0].cyclesSinceRetrace, line->endPoints[1].cyclesSinceRetrace, offset),
uint vertexID [[vertex_id]]) { line->line);
}
float2 textureLocation(constant Scan *scan, float offset) {
return float2(
mix(scan->endPoints[0].dataOffset, scan->endPoints[1].dataOffset, offset),
scan->dataY);
}
template <typename Input> SourceInterpolator toDisplay(
constant Uniforms &uniforms [[buffer(1)]],
constant Input *inputs [[buffer(0)]],
uint instanceID [[instance_id]],
uint vertexID [[vertex_id]]) {
SourceInterpolator output; SourceInterpolator output;
// Get start and end vertices in regular float2 form. // Get start and end vertices in regular float2 form.
const float2 start = float2( const float2 start = float2(
float(scans[instanceID].endPoints[0].position[0]) / float(uniforms.scale.x), float(inputs[instanceID].endPoints[0].position[0]) / float(uniforms.scale.x),
float(scans[instanceID].endPoints[0].position[1]) / float(uniforms.scale.y) float(inputs[instanceID].endPoints[0].position[1]) / float(uniforms.scale.y)
); );
const float2 end = float2( const float2 end = float2(
float(scans[instanceID].endPoints[1].position[0]) / float(uniforms.scale.x), float(inputs[instanceID].endPoints[1].position[0]) / float(uniforms.scale.x),
float(scans[instanceID].endPoints[1].position[1]) / float(uniforms.scale.y) float(inputs[instanceID].endPoints[1].position[1]) / float(uniforms.scale.y)
); );
// Calculate the tangent and normal. // Calculate the tangent and normal.
@ -93,10 +114,10 @@ vertex SourceInterpolator scanToDisplay( constant Uniforms &uniforms [[buffer(1)
const float2 normal = float2(tangent.y, -tangent.x) / length(tangent); const float2 normal = float2(tangent.y, -tangent.x) / length(tangent);
// Load up the colour details. // Load up the colour details.
output.colourAmplitude = float(scans[instanceID].compositeAmplitude) / 255.0f; output.colourAmplitude = float(inputs[instanceID].compositeAmplitude) / 255.0f;
output.colourPhase = 3.141592654f * mix( output.colourPhase = 3.141592654f * mix(
float(scans[instanceID].endPoints[0].compositeAngle), float(inputs[instanceID].endPoints[0].compositeAngle),
float(scans[instanceID].endPoints[1].compositeAngle), float(inputs[instanceID].endPoints[1].compositeAngle),
float((vertexID&2) >> 1) float((vertexID&2) >> 1)
) / 32.0; ) / 32.0;
@ -116,20 +137,26 @@ vertex SourceInterpolator scanToDisplay( constant Uniforms &uniforms [[buffer(1)
0.0, 0.0,
1.0 1.0
); );
output.textureCoordinates = float2( output.textureCoordinates = textureLocation(&inputs[instanceID], float((vertexID&2) >> 1));
mix(scans[instanceID].endPoints[0].dataOffset, scans[instanceID].endPoints[1].dataOffset, float((vertexID&2) >> 1)),
scans[instanceID].dataY);
return output; return output;
} }
namespace { vertex SourceInterpolator scanToDisplay( constant Uniforms &uniforms [[buffer(1)]],
constant Scan *scans [[buffer(0)]],
constexpr sampler standardSampler( coord::pixel, uint instanceID [[instance_id]],
address::clamp_to_edge, // Although arbitrary, stick with this address mode for compatibility all the way to MTLFeatureSet_iOS_GPUFamily1_v1. uint vertexID [[vertex_id]]) {
filter::nearest); return toDisplay(uniforms, scans, instanceID, vertexID);
} }
vertex SourceInterpolator lineToDisplay( constant Uniforms &uniforms [[buffer(1)]],
constant Line *lines [[buffer(0)]],
uint instanceID [[instance_id]],
uint vertexID [[vertex_id]]) {
return toDisplay(uniforms, lines, instanceID, vertexID);
}
// MARK: - Various input format conversion samplers. // MARK: - Various input format conversion samplers.
// There's only one meaningful way to sample the luminance formats. // There's only one meaningful way to sample the luminance formats.