Skip to content

Add windows platform support for primitive_shape_test integration test - #190464

Merged
auto-submit[bot] merged 3 commits into
flutter:masterfrom
b-luk:primitiveshapetestwindowsrunner
Aug 3, 2026
Merged

auto-submit[bot] merged 3 commits into
flutter:masterfrom
b-luk:primitiveshapetestwindowsrunner

Conversation

@b-luk

@b-luk b-luk commented Aug 3, 2026 •

Copy link
Copy Markdown
Contributor

Without this fix, windows_primitive_shape_golden_test is currently failing with:
[2026-08-03 12:47:06.236940] [STDOUT] stdout: Failed to load "C:/b/s/w/ir/x/w/rc/tmpr_xvq3iy/flutter sdk/dev/integration_tests/primitive_shape_test/integration_test/primitive_shape_test.dart": No Windows desktop project configured. See https://flutter.dev/to/add-desktop-support to learn about adding Windows support to a project.
e.g. https://ci.chromium.org/ui/p/flutter/builders/staging/Windows%20windows_primitive_shape_golden_test/43/overview

Run at head:

Ran at head with:

led get-builder "luci.flutter.try:Windows windows_primitive_shape_golden_test" | \
led edit -pa git_ref='refs/pull/190464/head' | \
led edit -pa git_url='https://github.com/flutter/flutter' | \
led launch

Run results:

https://ci.chromium.org/ui/p/flutter/builders/try.shadow/Windows%20windows_primitive_shape_golden_test/2/overview

Generated new golden:

https://flutter-gold.skia.org/detail?grouping=name%3Dprimitive_shape.integration_test.primitive_shape_canvas_snapshot%26source_type%3Dflutter&digest=b978f6619a26f754ee1a2a2307504cbd&changelist_id=190464&crs=github
image

500% zoom:

image

Shows AA on all shapes.

Run prior to Windows AA fixes:

Ran it at commit 24debf8bbfc44134b71dca9739abda02e5e73b93, which is prior to both the MSAA and UberSDF Windows AA fixes:

led get-builder "luci.flutter.try:Windows windows_primitive_shape_golden_test" | \
led edit -pa git_ref='refs/pull/190464/head' | \
led edit -pa git_url='https://github.com/flutter/flutter' | \
led edit -pa flutter_prebuilt_engine_version='24debf8bbfc44134b71dca9739abda02e5e73b93' | \
led launch

Run results:

https://ci.chromium.org/ui/p/flutter/builders/try.shadow/Windows%20windows_primitive_shape_golden_test/3/overview

Generated new golden:

https://flutter-gold.skia.org/detail?grouping=name%3Dprimitive_shape.integration_test.primitive_shape_canvas_snapshot%26source_type%3Dflutter&digest=a1688d28bfb5359fdc31f698b916c5a3&changelist_id=190464&crs=github
image

500% zoom:

image

Shows no AA on UberSDF shapes (everything except for the stroked rsuperellipse in the bottom right), which is to be expected without the UberSDF AA fix.

The stroked rsuperellipse is rendered with tessellation, which depends on MSAA. This does show AA in the golden result, even without the Windows MSAA fix. This is an unusual finding, which I have brought up to @gaaclarke previously. From manually running the test app and examining the output, the app does not have AA for this case, but the golden screenshot seems to differ. I do not know what causes this difference in real app behavior vs in the golden output.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

@github-actions github-actions Bot added the a: desktop Running on desktop label Aug 3, 2026
@b-luk
b-luk marked this pull request as ready for review August 3, 2026 19:59

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request introduces a Windows runner and build configuration for the primitive_shape_test integration test, adding CMake files, resource scripts, and C++ source files. Review feedback suggests guarding OnDestroy() with a boolean flag to prevent double-destruction, simplifying the WindowClassRegistrar singleton, optimizing DLL usage by replacing LoadLibraryA with GetModuleHandleA for User32.dll, and explicitly capturing this in a lambda to comply with the Google C++ Style Guide.

Comment thread dev/integration_tests/primitive_shape_test/windows/runner/win32_window.h Outdated
Comment thread dev/integration_tests/primitive_shape_test/windows/runner/win32_window.cpp Outdated
Comment thread dev/integration_tests/primitive_shape_test/windows/runner/win32_window.cpp Outdated
Comment thread dev/integration_tests/primitive_shape_test/windows/runner/win32_window.cpp Outdated
Comment thread dev/integration_tests/primitive_shape_test/windows/runner/flutter_window.cpp Outdated
@b-luk b-luk added the CICD Run CI/CD label Aug 3, 2026
@b-luk
b-luk requested a review from gaaclarke August 3, 2026 20:03
@b-luk

b-luk commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

I'm ignoring all the gemini suggestions because this code is directly from flutter create.

@gaaclarke gaaclarke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Instead of checking in these files, just generate them with the script. I know we have examples of doing both in the repo. Not checking them in keeps the repo easier to manage (so it isn't full of boilerplate) and makes it more robust to changes in the templates.

@github-actions github-actions Bot removed the a: desktop Running on desktop label Aug 3, 2026
@b-luk

b-luk commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

Instead of checking in these files, just generate them with the script. I know we have examples of doing both in the repo. Not checking them in keeps the repo easier to manage (so it isn't full of boilerplate) and makes it more robust to changes in the templates.

Done. Nice, I wasn't aware that this was an option. It looks like wide_gamut_test is the singular test which did this, and all the other ones have the platform runners checked in.

@b-luk
b-luk requested a review from gaaclarke August 3, 2026 21:18

@gaaclarke gaaclarke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm!

@gaaclarke

Copy link
Copy Markdown
Member

It may be the only that uses that API? It isn't the only one that does this though, they are just doing it with bespoke methods.

@b-luk b-luk added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 3, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Aug 3, 2026
Merged via the queue into flutter:master with commit 1204b7a Aug 3, 2026
23 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 3, 2026
@b-luk
b-luk deleted the primitiveshapetestwindowsrunner branch August 4, 2026 17:18
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Aug 10, 2026
…12406)

Manual roll Flutter from e52f01c920ad to b766512c65d8 (42 revisions)

Manual roll requested by [email protected]

flutter/flutter@e52f01c...b766512

2026-08-04 [email protected] Roll Dart SDK from 2a799a2404e9 to 9859c0a39adb (4 revisions) (flutter/flutter#190521)
2026-08-04 [email protected] Revert: iOS: Eliminate use of IOSContextNoop in platform view tests (flutter/flutter#190501)
2026-08-04 [email protected] [Impeller] Enable ETC2/ASTC LDR/BC texture compression features at Vulkan device creation (flutter/flutter#189303)
2026-08-03 [email protected] Remove openglessdf from impeller_unittests. (flutter/flutter#190469)
2026-08-03 [email protected] [web] Unify image decoding and codecs on CanvasKit and Skwasm (flutter/flutter#188573)
2026-08-03 [email protected] iOS: Eliminate use of IOSContextNoop in platform view tests (flutter/flutter#190419)
2026-08-03 [email protected] Add path rendering benchmarks (flutter/flutter#188654)
2026-08-03 [email protected] Add windows platform support for primitive_shape_test integration test (flutter/flutter#190464)
2026-08-03 [email protected] Roll Skia from 958c1c1921a1 to a08d918ebd6a (3 revisions) (flutter/flutter#190467)
2026-08-03 [email protected] tests: add --ios-runtime param (flutter/flutter#190414)
2026-08-03 [email protected] iOS: Remove the synchronous first-frame wait (flutter/flutter#190432)
2026-08-03 [email protected] iOS: Eliminate the Impeller/Skia backend selection params (flutter/flutter#190416)
2026-08-03 [email protected] iOS,macOS: Use @autoclosure in Logger (flutter/flutter#190417)
2026-08-03 [email protected] tools: Support FLUTTER_HOST_ARCH in update_dart_sdk scripts (flutter/flutter#190421)
2026-08-03 [email protected] iOS: Hardcode rendering API to Metal in tests (no-op) (flutter/flutter#190422)
2026-08-03 [email protected] a11y: Map disabled/read-only semantics to AX node restriction (flutter/flutter#190353)
2026-08-03 [email protected] [Infra] Replace defunct umbrella template with Wasm issue form (flutter/flutter#190471)
2026-08-03 [email protected] Roll Skia from abecb0dc02c1 to 958c1c1921a1 (4 revisions) (flutter/flutter#190459)
2026-08-03 [email protected] Roll Dart SDK from 65b163be2485 to 2a799a2404e9 (3 revisions) (flutter/flutter#190454)
2026-08-03 [email protected] Roll Skia from 68efb3f2ad16 to abecb0dc02c1 (1 revision) (flutter/flutter#190443)
2026-08-03 [email protected] Roll Packages from 5351d8c to ac87e65 (4 revisions) (flutter/flutter#190441)
2026-08-03 [email protected] Roll Skia from 5a761eb826c1 to 68efb3f2ad16 (1 revision) (flutter/flutter#190440)
2026-08-03 [email protected] Roll Skia from 4c9f8b4805e2 to 5a761eb826c1 (1 revision) (flutter/flutter#190437)
2026-08-03 [email protected] [macOS] Resume app lifecycle on becomeActive to avoid frozen UI after occlusion (flutter/flutter#188772)
2026-08-03 [email protected] Roll Skia from 39cda9d6d7d2 to 4c9f8b4805e2 (6 revisions) (flutter/flutter#190426)
2026-08-03 [email protected] Roll Skia from df13bfb5a54e to 39cda9d6d7d2 (2 revisions) (flutter/flutter#190425)
2026-08-02 [email protected] iOS: Serialise CADisplayLink access in VSyncClient tests (flutter/flutter#190335)
2026-08-02 [email protected] Roll Skia from 32329e5643b5 to df13bfb5a54e (1 revision) (flutter/flutter#190394)
2026-08-02 [email protected] [Impeller] Skip binding dead-code-eliminated resources on Metal (flutter/flutter#190040)
2026-08-01 [email protected] [Flutter GPU] Raise Dart errors for invalid render pipelines and memoize per-draw pipeline state (flutter/flutter#189899)
2026-08-01 [email protected] Revert "Improve non rect platform view rendering  (#182662)" (flutter/flutter#190003)
2026-08-01 [email protected] Roll Skia from ebf50520d720 to 32329e5643b5 (1 revision) (flutter/flutter#190389)
2026-08-01 [email protected] Roll Skia from f73c4510d12d to ebf50520d720 (6 revisions) (flutter/flutter#190376)
2026-07-31 [email protected] Primitive shape integration test (flutter/flutter#190368)
2026-07-31 [email protected] Eliminate some early returns in uber_sdf.frag to fix broken UberSDF AA on Windows (flutter/flutter#190260)
2026-07-31 [email protected] chore: swiftshader mirrored + llvm16 (flutter/flutter#181225)
2026-07-31 [email protected] [web] Remove in-repo agent documentation (flutter/flutter#190326)
2026-07-31 [email protected] [windows]: Uses offscreen MSAA when implicit msaa isn't available. (flutter/flutter#190256)
2026-07-31 [email protected] flutter_tools: Use new FileSystemExtension from devtools (flutter/flutter#190360)
2026-07-31 [email protected] Roll Dart SDK from c3acfc2479f6 to 65b163be2485 (1 revision) (flutter/flutter#190358)
2026-07-31 [email protected] Use devicectl for screenshots on Xcode 27, remove idevicescreenshot artifact (flutter/flutter#189091)
2026-07-31 [email protected] Roll Skia from 7ef86a5b0eb9 to f73c4510d12d (1 revision) (flutter/flutter#190352)

If this roll has caused a breakage, revert this CL and stop the roller
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants