6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 16:30:29 +00:00
Code Issues Projects Releases Wiki Activity

Resolves thread-unsafe access of _view.bounds.

Browse Source
This commit is contained in:
Thomas Harte 2020-09-22 22:13:37 -04:00
parent c0b1308dfd
commit a781c3eb4d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,8 +278,9 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
size_t _chromaKernelSize; size_t _chromaKernelSize;
std::atomic<bool> _isUsingSupersampling; std::atomic<bool> _isUsingSupersampling;
// The output view. // The output view and its aspect ratio.
__weak MTKView *_view; __weak MTKView *_view;
CGFloat _viewAspectRatio; // To avoid accessing .bounds away from the main thread.
} }
- (nonnull instancetype)initWithView:(nonnull MTKView *)view { - (nonnull instancetype)initWithView:(nonnull MTKView *)view {
@ -357,6 +358,7 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
@param size New drawable size in pixels @param size New drawable size in pixels
*/ */
- (void)mtkView:(nonnull MTKView *)view drawableSizeWillChange:(CGSize)size { - (void)mtkView:(nonnull MTKView *)view drawableSizeWillChange:(CGSize)size {
_viewAspectRatio = size.width / size.height;
[self setAspectRatio]; [self setAspectRatio];
@synchronized(self) { @synchronized(self) {
@ -522,7 +524,6 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
- (void)setAspectRatio { - (void)setAspectRatio {
const auto modals = _scanTarget.modals(); const auto modals = _scanTarget.modals();
const auto viewAspectRatio = (_view.bounds.size.width / _view.bounds.size.height);
simd::float3x3 sourceToDisplay{1.0f}; simd::float3x3 sourceToDisplay{1.0f};
// The starting coordinate space is [0, 1]. // The starting coordinate space is [0, 1].
@ -550,7 +551,7 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
// Determine the correct zoom level. This is a combination of (i) the necessary horizontal stretch to produce a proper // Determine the correct zoom level. This is a combination of (i) the necessary horizontal stretch to produce a proper
// aspect ratio; and (ii) the necessary zoom from there to either fit the visible area width or height as per a decision // aspect ratio; and (ii) the necessary zoom from there to either fit the visible area width or height as per a decision
// on letterboxing or pillarboxing. // on letterboxing or pillarboxing.
const float aspectRatioStretch = float(modals.aspect_ratio / viewAspectRatio); const float aspectRatioStretch = float(modals.aspect_ratio / _viewAspectRatio);
const float fitWidthZoom = 1.0f / (float(modals.visible_area.size.width) * aspectRatioStretch); const float fitWidthZoom = 1.0f / (float(modals.visible_area.size.width) * aspectRatioStretch);
const float fitHeightZoom = 1.0f / float(modals.visible_area.size.height); const float fitHeightZoom = 1.0f / float(modals.visible_area.size.height);
const float zoom = std::min(fitWidthZoom, fitHeightZoom); const float zoom = std::min(fitWidthZoom, fitHeightZoom);