Re: [Integrated] RFR: 8237770: Error creating fragment phong shader on iOS
Changeset: 56267e1f Author:Jose Pereda Committer: Kevin Rushforth Date: 2020-02-01 23:41:31 + 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
Re: [Rev 01] RFR: 8237770: Error creating fragment phong shader on iOS
On Fri, 31 Jan 2020 23:49:21 GMT, Jose Pereda wrote: >> 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 > > The pull request has been updated with 1 additional commit. Looks good. - Marked as reviewed by kcr (Lead). PR: https://git.openjdk.java.net/jfx/pull/93
Re: [Rev 01] RFR: 8237770: Error creating fragment phong shader on iOS
On Fri, 31 Jan 2020 00:51:22 GMT, Kevin Rushforth wrote: >> The pull request has been updated with 1 additional commit. > > modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag > line 32: > >> 31: #extension GL_OES_standard_derivatives : enable >> 32: #define EXTENSION_APPLIED >> 33: #endif > > Usual practice is to put the `#define` right after the `#ifndef`, but I don't > have a strong opinion about that. Makes sense, I've applied the change - PR: https://git.openjdk.java.net/jfx/pull/93
Re: [Rev 01] RFR: 8237770: Error creating fragment phong shader on iOS
> 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 The pull request has been updated with 1 additional commit. - Added commits: - 81338e6c: Apply #define right after #ifndef Changes: - all: https://git.openjdk.java.net/jfx/pull/93/files - new: https://git.openjdk.java.net/jfx/pull/93/files/14ccbe6a..81338e6c Webrevs: - full: https://webrevs.openjdk.java.net/jfx/93/webrev.01 - incr: https://webrevs.openjdk.java.net/jfx/93/webrev.00-01 Stats: 30 lines in 15 files changed: 15 ins; 15 del; 0 mod Patch: https://git.openjdk.java.net/jfx/pull/93.diff Fetch: git fetch https://git.openjdk.java.net/jfx pull/93/head:pull/93 PR: https://git.openjdk.java.net/jfx/pull/93
Re: RFR: 8237770: Error creating fragment phong shader on iOS
On Fri, 24 Jan 2020 11:31:02 GMT, Jose Pereda wrote: > 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 I verified that this works correctly. I have a minor style comment for you to consider. modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag line 32: > 31: #extension GL_OES_standard_derivatives : enable > 32: #define EXTENSION_APPLIED > 33: #endif Usual practice is to put the `#define` right after the `#ifndef`, but I don't have a strong opinion about that. - PR: https://git.openjdk.java.net/jfx/pull/93
RFR: 8237770: Error creating fragment phong shader on iOS
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 - Commits: - 14ccbe6a: Define pre-processor in frag files to avoid inline declaration of #extension when several frags are combined Changes: https://git.openjdk.java.net/jfx/pull/93/files Webrev: https://webrevs.openjdk.java.net/jfx/93/webrev.00 Issue: https://bugs.openjdk.java.net/browse/JDK-8237770 Stats: 45 lines in 15 files changed: 45 ins; 0 del; 0 mod Patch: https://git.openjdk.java.net/jfx/pull/93.diff Fetch: git fetch https://git.openjdk.java.net/jfx pull/93/head:pull/93 PR: https://git.openjdk.java.net/jfx/pull/93
