Skip to content
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.

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

8232210: Update Mesa 3-D Headers to version 19.2.1 #26

Closed

Conversation

@kevinrushforth
Copy link
Member

kevinrushforth commented Oct 29, 2019

This PR updates the header files we use the build the OpenGL ES2 pipeline to Mesa 19.2.1. See this review thread for the equivalent change that is under review for Java2D.

The updates to the gl.h and glx.h files are large, since we are many, many years behind.

The *ext.h header files were updated fairly recently, so those diffs are not large.

Previously we used to get the *ext.h headers from Khronos, but now we get all the headers from the Mesa project.

This reduces the number of upstream sources we need to monitor.

I note that with this update, the glxext.h and wglext.h files are slightly older in the Mesa bundle than in Khronos, but the differences are not relevant to FX.

I did a full build and test on Mac and Linux and a sanity build (with -PINCLUDE_ES2=true) on Windows. I also verified that the build artifacts are unchanged.

As with the Java2D change, the licensing terms are the same as before, but since we no longer get files directly from Khronos, the opengl_fx.md file is gone and the mesa3d.md is updated as required to mention these files.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

JDK-8232210: Update Mesa 3-D Headers to version 19.2.1

Approvers

  • Phil Race (prr - Reviewer)
  • Ambarish Rapte (arapte - Reviewer)
@kevinrushforth kevinrushforth self-assigned this Oct 29, 2019
@kevinrushforth kevinrushforth requested a review from johanvos Oct 29, 2019
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 29, 2019

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@kevinrushforth
Copy link
Member Author

kevinrushforth commented Oct 29, 2019

Reviewers: @prrace, @arapte, @johanvos

@openjdk openjdk bot added the rfr label Oct 29, 2019
@mlbridge
Copy link

mlbridge bot commented Oct 29, 2019

Webrevs

@mrserb
Copy link

mrserb commented Oct 30, 2019

Not sure but should not the license be GPL+CP in some of these files?

@prrace
Copy link
Contributor

prrace commented Oct 30, 2019

Not sure but should not the license be GPL+CP in some of these files?

It is not necessary.

@prrace
prrace approved these changes Oct 30, 2019
@openjdk openjdk bot removed the rfr label Oct 30, 2019
@openjdk
Copy link

openjdk bot commented Oct 30, 2019

@kevinrushforth This change can now be integrated. The commit message will be:

8232210: Update Mesa 3-D Headers to version 19.2.1

Reviewed-by: prr, arapte
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.
  • To integrate this PR with the above commit message, type /integrate in a new comment.
@prrace
prrace approved these changes Oct 30, 2019
Copy link

arapte left a comment

looks good to me, posted a small query in mesa3d.md file.

@arapte
arapte approved these changes Nov 5, 2019
@kevinrushforth
Copy link
Member Author

kevinrushforth commented Nov 5, 2019

/integrate

@openjdk openjdk bot closed this Nov 5, 2019
@openjdk openjdk bot added integrated and removed ready labels Nov 5, 2019
@openjdk
Copy link

openjdk bot commented Nov 5, 2019

@kevinrushforth
Pushed as commit a1cc4ab.

@mlbridge
Copy link

mlbridge bot commented Nov 5, 2019

Mailing list message from Kevin Rushforth kcr@openjdk.org

Changeset: a1cc4ab
Author: Kevin Rushforth
Date: 2019-11-05 11:27:22 +0000
URL: https://git.openjdk.java.net/jfx/commit/a1cc4ab0

8232210: Update Mesa 3-D Headers to version 19.2.1

Reviewed-by: prr, arapte

! modules/javafx.graphics/src/main/legal/mesa3d.md

  • modules/javafx.graphics/src/main/legal/opengl_fx.md
    ! modules/javafx.graphics/src/main/native-prism-es2/GL/gl.h
    ! modules/javafx.graphics/src/main/native-prism-es2/GL/glext.h
    ! modules/javafx.graphics/src/main/native-prism-es2/GL/glx.h
    ! modules/javafx.graphics/src/main/native-prism-es2/GL/glxext.h
    ! modules/javafx.graphics/src/main/native-prism-es2/GL/wglext.h
    ! modules/javafx.graphics/src/main/native-prism-es2/KHR/khrplatform.h
@kevinrushforth kevinrushforth deleted the kevinrushforth:8232210-mesa-19.2.1 branch Nov 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.