aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java
index ace4183..fa556e9 100644
--- a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java
+++ b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java
@@ -6982,13 +6982,14 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline
private static void checkGLSLShaderExtensions(Canvas3D cv, JoglContext ctx, GL2ES2 gl, boolean hasgl13)
{
- // Force shaders to be disabled, since no multitexture support
- if (!hasgl13)
- return;
-
- if ((gl.isExtensionAvailable("GL_ARB_shader_objects") //
- && gl.isExtensionAvailable("GL_ARB_shading_language_100")) //
- || gl.isExtensionAvailable("GL_AMD_program_binary_Z400"))
+ //PJPJ GL2ES2 MUST support shaders, and the support is NOT an extension
+ // Force shaders to be disabled, since no multitexture support
+ // if (!hasgl13)
+ // return;
+
+ // if ((gl.isExtensionAvailable("GL_ARB_shader_objects") //
+ // && gl.isExtensionAvailable("GL_ARB_shading_language_100")) //
+ // || gl.isExtensionAvailable("GL_AMD_program_binary_Z400"))
{
// FIXME: this isn't complete and would need to set up the