Merge pull request #2 from artrointel/master

nekocode · web-flow · commit cdfa86c374b1 · 2020-04-10T19:58:03.000+08:00
Update blur.fsh
diff --git a/app/src/main/res/raw/blur.fsh b/app/src/main/res/raw/blur.fsh
@@ -13,7 +13,7 @@ float SCurve (float x) {
     return -x * abs(x) * 0.5 + x + 0.5;
 }
 
-vec4 BlurH (sampler2D source, vec2 size, vec2 uv, float radius) {
+vec4 BlurH (samplerExternalOES source, vec2 size, vec2 uv, float radius) {
 
 	if (radius >= 1.0)
 	{
@@ -59,4 +59,4 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord )
 
 void main() {
 	mainImage(gl_FragColor, texCoord*iResolution.xy);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ float SCurve (float x) {`
`13`	`13`	`return -x * abs(x) * 0.5 + x + 0.5;`
`14`	`14`	`}`
`15`	`15`
`16`		`-vec4 BlurH (sampler2D source, vec2 size, vec2 uv, float radius) {`
	`16`	`+vec4 BlurH (samplerExternalOES source, vec2 size, vec2 uv, float radius) {`
`17`	`17`
`18`	`18`	`if (radius >= 1.0)`
`19`	`19`	`{`
`@@ -59,4 +59,4 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord )`
`59`	`59`
`60`	`60`	`void main() {`
`61`	`61`	`mainImage(gl_FragColor, texCoord*iResolution.xy);`
`62`		`-}`
	`62`	`+}`