diff options
| -rw-r--r-- | make/build-jogl.xml | 5 | ||||
| -rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java | 2 | ||||
| -rw-r--r-- | src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 547c8b184..c2da1cc73 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -216,6 +216,9 @@ <property name="java.part.util.fixedfuncemu" value="com/sun/opengl/util/glsl/fixedfunc/**"/> + <property name="java.part.util.fixedfuncemu.shadercode" + value="com/sun/opengl/util/glsl/fixedfunc/impl/shaders/*, com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/> + <!-- condition excludes --> <condition property="java.excludes.egl" @@ -1700,6 +1703,8 @@ <jar manifest="tempversion" destfile="${jogl.util.fixedfuncemu.jar}"> <fileset dir="${classes}" includes="${java.part.util.fixedfuncemu}"/> + <fileset dir="${src.java}" + includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> <jar manifest="tempversion" destfile="${jogl.all.jar}"> <fileset dir="${classes}"> diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java index 560124a99..4bf3832d4 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java @@ -24,7 +24,7 @@ public GL2ES12Impl(GLContextImpl context) { private boolean isGL2ES2; public final boolean isGL() { - return false; + return true; } public final boolean isGL2() { diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java index 02d6ec92e..9c8a65173 100644 --- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java +++ b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java @@ -22,7 +22,7 @@ public class FixedFuncUtil { if(gl.isGL2ES1()) { return gl.getGL2ES1(); } else if(gl.isGL2ES2()) { - GL2ES2 es2 = (GL2ES2)gl; + GL2ES2 es2 = gl.getGL2ES2(); FixedFuncHook hook = new FixedFuncHook(es2); FixedFuncImpl impl = new FixedFuncImpl(es2, hook); gl.getContext().setGL(impl); |