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

8237770: Error creating fragment phong shader on iOS #93

Closed

Conversation

@jperedadnr
Copy link

jperedadnr commented Jan 24, 2020

This PR defines a pre-processor in the phong frag files to avoid inline declaration of #extension when several frags are combined that leads to the error:

syntax error: #extension must always be before any non-preprocessor tokens 

Progress

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

Issue

JDK-8237770: Error creating fragment phong shader on iOS

Approvers

  • Kevin Rushforth (kcr - Reviewer)
…tension when several frags are combined
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 24, 2020

👋 Welcome back jpereda! 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).

@openjdk openjdk bot added the rfr label Jan 24, 2020
@mlbridge
Copy link

mlbridge bot commented Jan 24, 2020

Webrevs

Copy link
Member

kevinrushforth left a comment

I verified that this works correctly. I have a minor style comment for you to consider.

jose.pereda
Copy link
Member

kevinrushforth left a comment

Looks good.

@openjdk
Copy link

openjdk bot commented Jan 31, 2020

@jperedadnr This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8237770: Error creating fragment phong shader on iOS

Reviewed-by: kcr
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 14 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 95bf2c006a5b105fba0a33543f3ec096a9e45a74.

As you do not have Committer status in this project, an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@kevinrushforth) but any other Committer may sponsor as well.

➡️ 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 openjdk bot added the ready label Jan 31, 2020
@jperedadnr
Copy link
Author

jperedadnr commented Feb 1, 2020

/integrate

@openjdk openjdk bot added the sponsor label Feb 1, 2020
@openjdk
Copy link

openjdk bot commented Feb 1, 2020

@jperedadnr
Your change (at version 81338e6) is now ready to be sponsored by a Committer.

@kevinrushforth
Copy link
Member

kevinrushforth commented Feb 1, 2020

/sponsor

@openjdk openjdk bot closed this Feb 1, 2020
@openjdk openjdk bot added integrated and removed sponsor ready rfr labels Feb 1, 2020
@openjdk
Copy link

openjdk bot commented Feb 1, 2020

@kevinrushforth @jperedadnr The following commits have been pushed to master since your change was applied:

  • 95bf2c0: 8237782: Only read advances up to the minimum of the numHorMetrics or the available font data.
  • d05e8fc: 8237833: Check glyph size before adding to glyph texture cache
  • 1213ea7: Merge
  • 1823f6e: 8088198: Exception thrown from snapshot if dimensions are larger than max texture size
  • ca37c1f: 8238249: GetPrimitiveArrayCritical passed with hardcoded FALSE value
  • b96bc52: 8237003: Remove hardcoded WebAnimationsCSSIntegrationEnabled flag in DumpRenderTree
  • d303a21: Merge
  • 5a0e71b: 8237372: NullPointerException in TabPaneSkin.stopDrag
  • 79fc0d0: 8232824: Removing TabPane with strong referenced content causes memory leak from weak one
  • aa6f3a4: 8236912: NullPointerException when clicking in WebView with Button 4 or Button 5
  • 921389f: Merge
  • da99e24: 8237823: Mark TextTest.testTabSize as unstable
  • 66ac99f: Merge
  • 9ae37f1: 8236753: Animations do not play backwards after being stopped

Your commit was automatically rebased without conflicts.

Pushed as commit 56267e1.

@mlbridge
Copy link

mlbridge bot commented Feb 2, 2020

Mailing list message from Kevin Rushforth on openjfx-dev:

Changeset: 56267e1
Author: Jose Pereda <jpereda at openjdk.org>
Committer: Kevin Rushforth <kcr at openjdk.org>
Date: 2020-02-01 23:41:31 +0000
URL: https://git.openjdk.java.net/jfx/commit/56267e1f

8237770: Error creating fragment phong shader on iOS

Reviewed-by: kcr

! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_none.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_texture.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main0Lights.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main1Light.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main2Lights.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main3Lights.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/normalMap_none.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/normalMap_texture.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/selfIllum_none.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/selfIllum_texture.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_color.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_mix.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_none.frag
! modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_texture.frag

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

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