8369335: Two sun/java2d/OpenGL tests fail on Windows after JDK-8358058#265
8369335: Two sun/java2d/OpenGL tests fail on Windows after JDK-8358058#265rm-gh-8 wants to merge 3 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back rm-gh-8! A progress list of the required criteria for merging this PR into |
|
@rm-gh-8 This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 6 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. ➡️ To flag this PR as ready for integration with the above commit message, type |
|
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
|
/approval request for backport of JDK-8369335: Two sun/java2d/OpenGL tests fail on Windows after JDK-8358058. This test fix addresses issues introduced by JDK-8358058, which was added for Oracle JDK parity. Note: test/jdk/sun/java2d/OpenGL/ScaleParamsOOB.java fails on linux-x64 and linux-aarch64 (using xvfb and libmesa software rendering) with a color mismatch error (expected=ffff0000 actual=ff000000 at x=40 y=40), similar to the error resolved in this PR, but remains unaddressed since to JDK-8358058. Created JDK-8377908 to capture the issue. |
|
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout JDK-8369335-V25
git fetch https://git.openjdk.org/jdk25u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
/integrate |
|
/sponsor |
|
Going to push as commit 6a95907.
Your commit was automatically rebased without conflicts. |
|
@phohensee @rm-gh-8 Pushed as commit 6a95907. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Backporting JDK-8369335: Two sun/java2d/OpenGL tests fail on Windows after JDK-8358058.
This PR fixes two OpenGL tests (ScaleParamsOOB.java and OpaqueDest.java) fail after JDK-8358058 with color mismatch errors due to HiDPI fractional scaling issues when using OpenGL with hardware acceleration. Tests updated to handle Windows HiDPI fractional scaling correctly.
For parity with Oracle JDK.
Ran related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:
make test TEST=test/jdk/sun/java2d/OpenGL/OpaqueDest.java
make test TEST=test/jdk/sun/java2d/OpenGL/ScaleParamsOOB.java
Note: test/jdk/sun/java2d/OpenGL/ScaleParamsOOB.java fails on linux-x64 and linux-aarch64 (using xvfb and libmesa software rendering) with a color mismatch error (expected=ffff0000 actual=ff000000 at x=40 y=40), similar to the error resolved in this PR, but remains unaddressed since to JDK-8358058. Created JDK-8377908 to capture the issue.
Results attached:
macos-aarch64-specific-test.log
macos-aarch64-specific-2-test.log
windows-x64-specific-test.log
windows-x64-specific-2-test.log
linux-x64-specific-test.log
linux-x64-specific-2-test.log
linux-aarch64-specific-test.log
linux-aarch64-specific-2-test.log
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/265/head:pull/265$ git checkout pull/265Update a local copy of the PR:
$ git checkout pull/265$ git pull https://git.openjdk.org/jdk25u-dev.git pull/265/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 265View PR using the GUI difftool:
$ git pr show -t 265Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/265.diff
Using Webrev
Link to Webrev Comment