1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 23:32:28 +00:00

Merge pull request #1089 from TomHarte/MetalPadding

Incorporate new additional padding.
This commit is contained in:
Thomas Harte 2022-08-29 11:47:29 -04:00 committed by GitHub
commit 54ca168db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,7 +60,8 @@ constexpr sampler linearSampler( coord::pixel,
// 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,
// with a couple of added fields.
struct Scan { struct Scan {
struct EndPoint { struct EndPoint {
uint16_t position[2]; uint16_t position[2];
@ -69,7 +70,10 @@ struct Scan {
uint16_t cyclesSinceRetrace; uint16_t cyclesSinceRetrace;
} endPoints[2]; } endPoints[2];
union {
uint8_t compositeAmplitude; uint8_t compositeAmplitude;
uint32_t padding; // TODO: reuse some padding as the next two fields, to save two bytes.
};
uint16_t dataY; uint16_t dataY;
uint16_t line; uint16_t line;
}; };