8378201: [OGL] glXMakeContextCurrent() drops the buffers of the unbound drawable by rm-gh-8 · Pull Request #387 · openjdk/jdk25u-dev

rm-gh-8 · 2026-03-13T16:56:34Z

Backporting JDK-8369561: sun/java2d/OpenGL/DrawBitmaskImage.java#id0: Incorrect color for first pixel (actual=ff000000) and JDK-8378201: [OGL] glXMakeContextCurrent() drops the buffers of the unbound drawable.

This PR works around a Mesa bug (mesa#1001) where glXMakeContextCurrent() corrupts buffers when using raw X Window IDs.

For parity with Oracle JDK.

The PR is not clean because of a conflict in the year of the copyright in the header of "src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c", which is trivial in nature.

Ran related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:

make test TEST=test/jdk/sun/java2d/OpenGL/FlipCoexistTest.java
make test TEST=test/jdk/sun/java2d/OpenGL/MultiWindowFillTest.java
make test TEST=test/jdk/sun/java2d/OpenGL/DrawBitmaskImage.java
make run-test TEST="jtreg:jdk_desktop" JTREG='VERBOSE=summary;KEYWORDS=!headful&!printer'

windows-x64-specific-test.log
windows-x64-specific-2-test.log
windows-x64-specific-3-test.log
windows-x64-specific-4-test.log
macos-aarch64-specific-test.log
macos-aarch64-specific-2-test.log
macos-aarch64-specific-3-test.log
macos-aarch64-specific-4-test.log
linux-x64-specific-test.log
linux-x64-specific-2-test.log
linux-x64-specific-3-test.log
linux~x64-specific-4-test.log
linux-aarch64-specific-test.log
linux-aarch64-specific-2-test.log
linux-aarch64-specific-3-test.log
linux-aarch64-specific-4-test.log

Progress

JDK-8369561 needs maintainer approval
Change must not contain extraneous whitespace
Commit message must refer to an issue
JDK-8378201 needs maintainer approval

Issues

JDK-8378201: [OGL] glXMakeContextCurrent() drops the buffers of the unbound drawable (Bug - P3 - Approved)
JDK-8369561: sun/java2d/OpenGL/DrawBitmaskImage.java#id0: Incorrect color for first pixel (actual=ff000000) (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/387/head:pull/387
$ git checkout pull/387

Update a local copy of the PR:
$ git checkout pull/387
$ git pull https://git.openjdk.org/jdk25u-dev.git pull/387/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 387

View PR using the GUI difftool:
$ git pr show -t 387

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/387.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2026-03-13T16:57:40Z

👋 Welcome back rm-gh-8! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2026-03-13T16:59:12Z

@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:

8378201: [OGL] glXMakeContextCurrent() drops the buffers of the unbound drawable
8369561: sun/java2d/OpenGL/DrawBitmaskImage.java#id0: Incorrect color for first pixel (actual=ff000000)

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 45 new commits pushed to the master branch:

622fb19: 8379416: AIX build fails if system (not GNU) date tool is in PATH
7672013: 8361726: Shenandoah: More detailed evacuation instrumentation
1292cda: 8064922: [macos] Test javax/swing/JTabbedPane/4624207/bug4624207.java fails
... and 42 more: https://git.openjdk.org/jdk25u-dev/compare/79f0f9ded514c763ad085abb5b156a81bf633c16...master

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 /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2026-03-13T16:59:20Z

This backport pull request has now been updated with issues from the original commit.

openjdk · 2026-03-13T17:29:48Z

⚠️ @rm-gh-8 This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

mlbridge · 2026-03-13T17:33:20Z

Webrevs

00: Full (c3b38a09)

mrserb · 2026-03-16T01:41:58Z

For product bugs (non-test bugs) in the jdk desktop module, I recommend running the full set of tests from the jdk_desktop module group (these tests are not part of github actions), for example:
make run-test TEST="jtreg:jdk_desktop" JTREG='VERBOSE=summary;KEYWORDS=!headful&!printer'
and then:
make run-test TEST_JOBS=1 TEST="jtreg:jdk_desktop" JTREG='VERBOSE=summary;KEYWORDS=headful&!printer;RETRY_COUNT=5'

GoeLin · 2026-03-19T16:34:30Z

Hi @rm-gh-8, @mrserb
I ran the above mentioned tests with your backport.
I put the change into our nightly testing that executed the !headful tests successfully.
I ran the headful ones by hand on on SLES15-SP4. I needed several tries, but RETRY_COUNT=5 did not work as it takes too long.
Thys I selectively restarted the tests that failed in the first run. Most finished successful except for the following ones:

NonEmptyErrorStream.java+UnninstallUIMemoryLeaks.java
My system prints some error messages as it is not set up perfectly.
These tests check for empty stderr, but find these messages.

SwingFontMetricsTest.java
Failing without the fix, too.

I omitted bug8057791.java. It is extemely slow. Also slow without the fix.

Further I omitted bug4314194.java, it seems to hang. I verified it behaves
similarly without this fix.

rm-gh-8 · 2026-03-20T21:22:10Z

/approval request for backport of JDK-8369561: sun/java2d/OpenGL/DrawBitmaskImage.java#id0: Incorrect color for first pixel (actual=ff000000) and JDK-8378201: [OGL] glXMakeContextCurrent() drops the buffers of the unbound drawable.

This PR works around a Mesa bug (mesa#1001) where glXMakeContextCurrent() corrupts buffers when using raw X Window IDs.

For parity with Oracle JDK.

Medium risk — native C changes in a hot rendering path on Linux/X11, but well-scoped and directly tested.

openjdk · 2026-03-20T21:24:04Z

@rm-gh-8
8378201: The approval request has been created successfully.
8369561: The approval request has been created successfully.

rm-gh-8 · 2026-03-23T14:09:12Z

/integrate

openjdk · 2026-03-23T14:12:05Z

@rm-gh-8
Your change (at version c3b38a0) is now ready to be sponsored by a Committer.

phohensee · 2026-03-23T15:24:38Z

/sponsor

openjdk · 2026-03-23T15:26:33Z

Going to push as commit 88182af.
Since your change was applied there have been 45 commits pushed to the master branch:

622fb19: 8379416: AIX build fails if system (not GNU) date tool is in PATH
7672013: 8361726: Shenandoah: More detailed evacuation instrumentation
1292cda: 8064922: [macos] Test javax/swing/JTabbedPane/4624207/bug4624207.java fails
... and 42 more: https://git.openjdk.org/jdk25u-dev/compare/79f0f9ded514c763ad085abb5b156a81bf633c16...master

Your commit was automatically rebased without conflicts.

openjdk · 2026-03-23T15:27:00Z

@phohensee @rm-gh-8 Pushed as commit 88182af.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Backport e24a8f06e30a0889b1fb5689ac3d4180f90d25d4

c3b38a0

openjdk Bot changed the title ~~Backport e24a8f06e30a0889b1fb5689ac3d4180f90d25d4~~ 8378201: [OGL] glXMakeContextCurrent() drops the buffers of the unbound drawable Mar 13, 2026

openjdk Bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Mar 13, 2026

rm-gh-8 marked this pull request as ready for review March 13, 2026 17:26

openjdk Bot added the rfr Pull request is ready for review label Mar 13, 2026

openjdk Bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Mar 20, 2026

openjdk Bot added the sponsor Pull request is ready to be sponsored label Mar 23, 2026

openjdk Bot added the integrated Pull request has been integrated label Mar 23, 2026

openjdk Bot closed this Mar 23, 2026

openjdk Bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 23, 2026

rm-gh-8 mentioned this pull request Mar 23, 2026

8378789: Add sun/java2d/OpenGL/DrawBitmaskImage.java to the ProblemList.txt file openjdk/jdk21u-dev#2646

Closed

4 tasks

Conversation

rm-gh-8 commented Mar 13, 2026 • edited by openjdk Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewing

Uh oh!

bridgekeeper Bot commented Mar 13, 2026

Uh oh!

openjdk Bot commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk Bot commented Mar 13, 2026

Uh oh!

openjdk Bot commented Mar 13, 2026

Uh oh!

mlbridge Bot commented Mar 13, 2026

Webrevs

Uh oh!

mrserb commented Mar 16, 2026

Uh oh!

GoeLin commented Mar 19, 2026

Uh oh!

rm-gh-8 commented Mar 20, 2026

Uh oh!

openjdk Bot commented Mar 20, 2026

Uh oh!

rm-gh-8 commented Mar 23, 2026

Uh oh!

openjdk Bot commented Mar 23, 2026

Uh oh!

phohensee commented Mar 23, 2026

Uh oh!

openjdk Bot commented Mar 23, 2026

Uh oh!

openjdk Bot commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

rm-gh-8 commented Mar 13, 2026 •

edited by openjdk Bot

Loading

openjdk Bot commented Mar 13, 2026 •

edited

Loading