Merge pull request #15 from ml-bright/master

ChillingVan · web-flow · commit 28f1fa3130f3 · 2017-07-22T09:58:39.000+08:00
修复TwoTextureFilter用在texture target为OES的时候显示异常的情况
diff --git a/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/TwoTextureFilter.java b/canvasgl/src/main/java/com/chillingvan/canvasgl/textureFilter/TwoTextureFilter.java
@@ -105,4 +105,8 @@ public void onPreDraw(int program, BasicTexture texture, ICanvasGL canvas) {
         GLES20Canvas.checkError();
     }
 
+    @Override
+    public String getOesFragmentProgram() {
+        return "#extension GL_OES_EGL_image_external : require\n" + getFragmentShader().replaceFirst(SAMPLER_2D, SAMPLER_EXTERNAL_OES);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,8 @@ public void onPreDraw(int program, BasicTexture texture, ICanvasGL canvas) {`
`105`	`105`	`GLES20Canvas.checkError();`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ @Override`
	`109`	`+ public String getOesFragmentProgram() {`
	`110`	`+ return "#extension GL_OES_EGL_image_external : require\n" + getFragmentShader().replaceFirst(SAMPLER_2D, SAMPLER_EXTERNAL_OES);`
	`111`	`+ }`
`108`	`112`	`}`