Skip to content

Draw, MacOS - Fix image generation issue #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dpasukhi wants to merge 7 commits into
base: IR
Choose a base branch
from
Draft

Draw, MacOS - Fix image generation issue #657

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
918b3c0
Draw, MacOS - Fix image generation issue
dpasukhi Jul 30, 2025
abd86d6
Update testgrid command in macOS script to include 'helix' and 'stand…
dpasukhi Jul 30, 2025
6246c67
Fix Metal initialization and improve error handling in Draw_Window::S…
dpasukhi Jul 30, 2025
a43eb1d
Refactor GitHub Actions to use local artifact handling scripts for do…
dpasukhi Jul 30, 2025
98c7857
Refactor artifact handling in GitHub Actions to improve extraction pr…
dpasukhi Jul 30, 2025
cdb4fa0
Prevent directory nesting by removing existing target path before ext…
dpasukhi Jul 30, 2025
c0c2c85
Improve graphics context initialization to prevent Metal errors on macOS
dpasukhi Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/testgrid/testmacos.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
testgrid -outdir results/macos-x64 caf basic
testgrid -outdir results/macos-x64 "caf,helix" "basic,standard"
16 changes: 16 additions & 0 deletions src/Draw/TKDraw/Draw/Draw_Window_1.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,22 @@ static Standard_Integer getScreenBottom()
{
Cocoa_LocalPool aLocalPool;

// Suppress Metal initialization errors on macOS by pre-warming graphics context
static bool isMetalInitialized = false;
if (!isMetalInitialized) {
Copy link

Copilot AI Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The static boolean variable isMetalInitialized is not thread-safe. If this function can be called from multiple threads, consider using std::once_flag with std::call_once or adding proper synchronization to prevent race conditions during Metal initialization.

Suggested change
static bool isMetalInitialized = false;
if (!isMetalInitialized) {
static std::once_flag metalInitFlag;
std::call_once(metalInitFlag, []() {

Copilot uses AI. Check for mistakes.
@try {
// Create a minimal NSImage to trigger Metal initialization early
NSImage* aTempImage = [[NSImage alloc] initWithSize:NSMakeSize(1, 1)];
[aTempImage lockFocus];
[aTempImage unlockFocus];
[aTempImage release];
}
@catch (NSException*) {
// Ignore any Metal initialization exceptions
Copy link

Copilot AI Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Catching all NSException types without specifying the exception type or logging the error could hide important debugging information. Consider logging the exception details or catching more specific exception types to aid in troubleshooting Metal initialization issues.

Suggested change
@catch (NSException*) {
// Ignore any Metal initialization exceptions
@catch (NSException* exception) {
// Log Metal initialization exceptions for debugging purposes
NSLog(@"Metal initialization failed with exception: %@ - %@", [exception name], [exception reason]);

Copilot uses AI. Check for mistakes.
}
isMetalInitialized = true;
}

// converting left-bottom coordinate to left-top coordinate
Standard_Integer anYTop = getScreenBottom() - theXY.y() - theSize.y();

Expand Down
Loading