8237770: Error creating fragment phong shader on iOS

Jose Pereda · kevinrushforth · commit 56267e1ffb51 · 2020-02-01T23:41:33.000Z
Reviewed-by: kcr
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_none.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_none.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_texture.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_texture.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main0Lights.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main0Lights.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main1Light.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main1Light.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main2Lights.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main2Lights.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main3Lights.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/main3Lights.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/normalMap_none.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/normalMap_none.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/normalMap_texture.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/normalMap_texture.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/selfIllum_none.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/selfIllum_none.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/selfIllum_texture.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/selfIllum_texture.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_color.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_color.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_mix.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_mix.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_none.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_none.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
diff --git a/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_texture.frag b/modules/javafx.graphics/src/main/resources/com/sun/prism/es2/glsl/specular_texture.frag
@@ -27,7 +27,10 @@
 
 #ifdef GL_ES
 
+#ifndef EXTENSION_APPLIED
+#define EXTENSION_APPLIED
 #extension GL_OES_standard_derivatives : enable
+#endif
 
 // Define default float precision for fragment shaders
 #ifdef GL_FRAGMENT_PRECISION_HIGH
