aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rwxr-xr-xmake/gl-es2.cfg1
-rwxr-xr-xmake/gl-impl-CustomJavaCode-gles2.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/make/gl-es2.cfg b/make/gl-es2.cfg
index 85e591c8e..0abcb1daf 100755
--- a/make/gl-es2.cfg
+++ b/make/gl-es2.cfg
@@ -55,6 +55,7 @@ JavaPrologue glDrawArrays glDrawArraysPrologue();
JavaEpilogue glDrawArrays glDrawArraysEpilogue();
JavaPrologue glDrawElements glDrawArraysPrologue();
JavaEpilogue glDrawElements glDrawArraysEpilogue();
+JavaEpilogue glActiveTexture glActiveTextureEpilog({0});
IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-common.java
IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-gles2.java
diff --git a/make/gl-impl-CustomJavaCode-gles2.java b/make/gl-impl-CustomJavaCode-gles2.java
index f2682ab74..e1e4b0e2e 100755
--- a/make/gl-impl-CustomJavaCode-gles2.java
+++ b/make/gl-impl-CustomJavaCode-gles2.java
@@ -543,6 +543,11 @@ private final void glDrawArraysEpilogue() {
fixedFunction.glUseProgram(this, false);
}
}
+private final void glActiveTextureEpilog(int texture) {
+ if(fixedFunctionShaderActive) {
+ fixedFunction.glActiveTexture(this, texture);
+ }
+}
public void glLightfv(int light, int pname, java.nio.FloatBuffer params) {
if(!fixedFunctionShaderActive) {
throw new GLUnsupportedException("not enabled");