commit 1149be8f8e64efb2ccd3b92ada0ab1fd50cc4f66 Author: leszek Date: Mon Jun 26 22:15:04 2017 +0100 Fixes for dynamic postprocessing. diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java b/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java index f143921..5b7069e 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffectBlur.java @@ -30,7 +30,7 @@ import org.distorted.library.type.Data1D; public class PostprocessEffectBlur extends PostprocessEffect { - private static final int MAX_HALO = 50; // Support effects creating up to MAX_HALO pixels wide 'halo' around the object. + private static final int MAX_HALO = 50; private Data1D mBlurRadius; @@ -59,8 +59,8 @@ public class PostprocessEffectBlur extends PostprocessEffect private static float[] mWeights = new float[MAX_HALO]; private static float[] mOffsets = new float[MAX_HALO]; - private static DistortedProgram mBlur1Program, mBlur2Program; - private static int mBlur1Index, mBlur2Index; + private static DistortedProgram mProgram1, mProgram2; + private static int mIndex1, mIndex2; /////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -86,10 +86,10 @@ public class PostprocessEffectBlur extends PostprocessEffect public int apply(float[] uniforms, int index, float qualityScale, DistortedFramebuffer buffer) { - if( mBlur1Program==null) + if( mProgram1 ==null) { - mBlur1Program = mPrograms.get(mBlur1Index); - mBlur2Program = mPrograms.get(mBlur2Index); + mProgram1 = mPrograms.get(mIndex1); + mProgram2 = mPrograms.get(mIndex2); } buffer.setAsOutput(); @@ -104,21 +104,23 @@ public class PostprocessEffectBlur extends PostprocessEffect int offset = radius + radius*radius/4; radius = (radius+1)/2; + GLES30.glViewport(0, 0, (int)w1, (int)h1); // horizontal blur - GLES30.glViewport(0, 0, (int)w1, (int)h1); - mBlur1Program.useProgram(); + for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]/h1; + + mProgram1.useProgram(); buffer.bindForOutput(1); buffer.setAsInput(0); - GLES30.glUniform1fv( mBlur1Program.mUniform[3], radius+1, weightsCache,offset); - GLES30.glUniform1i( mBlur1Program.mUniform[4], radius); - GLES30.glUniform1f( mBlur1Program.mUniform[0] , near); - GLES30.glUniform1i( mBlur1Program.mUniform[1] , 0 ); - for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]/h1; - GLES30.glUniform1fv( mBlur1Program.mUniform[2] ,radius+1, mOffsets,0); - GLES30.glVertexAttribPointer(mBlur1Program.mAttribute[0], POS_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadPositions); - GLES30.glVertexAttribPointer(mBlur1Program.mAttribute[1], TEX_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadTexture); + GLES30.glUniform1f ( mProgram1.mUniform[0] , near); + GLES30.glUniform1i ( mProgram1.mUniform[1] , 0 ); + GLES30.glUniform1fv( mProgram1.mUniform[2] , radius+1, mOffsets,0); + GLES30.glUniform1fv( mProgram1.mUniform[3] , radius+1, weightsCache,offset); + GLES30.glUniform1i ( mProgram1.mUniform[4] , radius); + + GLES30.glVertexAttribPointer(mProgram1.mAttribute[0], POS_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadPositions); + GLES30.glVertexAttribPointer(mProgram1.mAttribute[1], TEX_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadTexture); DistortedRenderState.useStencilMark(); GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, 0, 4); @@ -127,7 +129,9 @@ public class PostprocessEffectBlur extends PostprocessEffect GLES30.glBindTexture(GLES30.GL_TEXTURE_2D, 0); // vertical blur - mBlur2Program.useProgram(); + for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]/w1; + + mProgram2.useProgram(); buffer.bindForOutput(0); buffer.setAsInput(1); @@ -135,14 +139,14 @@ public class PostprocessEffectBlur extends PostprocessEffect GLES30.glClearColor(0.0f,0.0f,0.0f,0.0f); GLES30.glClear(GLES30.GL_COLOR_BUFFER_BIT); - GLES30.glUniform1fv( mBlur2Program.mUniform[3], radius+1, weightsCache,offset); - GLES30.glUniform1i( mBlur2Program.mUniform[4], radius); - GLES30.glUniform1f( mBlur2Program.mUniform[0] , near); - GLES30.glUniform1i( mBlur2Program.mUniform[1] , 0 ); - for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]/w1; - GLES30.glUniform1fv( mBlur2Program.mUniform[2] ,radius+1, mOffsets,0); - GLES30.glVertexAttribPointer(mBlur2Program.mAttribute[0], POS_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadPositions); - GLES30.glVertexAttribPointer(mBlur2Program.mAttribute[1], TEX_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadTexture); + GLES30.glUniform1f ( mProgram2.mUniform[0] , near); + GLES30.glUniform1i ( mProgram2.mUniform[1] , 0 ); + GLES30.glUniform1fv( mProgram2.mUniform[2] , radius+1, mOffsets,0); + GLES30.glUniform1fv( mProgram2.mUniform[3] , radius+1, weightsCache,offset); + GLES30.glUniform1i ( mProgram2.mUniform[4] , radius); + + GLES30.glVertexAttribPointer(mProgram2.mAttribute[0], POS_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadPositions); + GLES30.glVertexAttribPointer(mProgram2.mAttribute[1], TEX_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadTexture); DistortedRenderState.useStencilMark(); GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, 0, 4); @@ -218,8 +222,8 @@ public class PostprocessEffectBlur extends PostprocessEffect " fragColor = pixel; \n"+ " }"; - mBlur1Index = PostprocessEffect.register("BLUR1", blurVertex,blurFragment1); - mBlur2Index = PostprocessEffect.register("BLUR2", blurVertex,blurFragment2); + mIndex1 = PostprocessEffect.register("BLUR1", blurVertex,blurFragment1); + mIndex2 = PostprocessEffect.register("BLUR2", blurVertex,blurFragment2); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java b/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java index 6c868ae..1e23740 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java @@ -19,7 +19,11 @@ package org.distorted.library.effect; +import android.opengl.GLES30; + import org.distorted.library.main.DistortedFramebuffer; +import org.distorted.library.main.DistortedRenderState; +import org.distorted.library.program.DistortedProgram; import org.distorted.library.type.Data1D; import org.distorted.library.type.Data4D; @@ -27,17 +31,41 @@ import org.distorted.library.type.Data4D; public class PostprocessEffectGlow extends PostprocessEffect { + private static final int MAX_HALO = 50; + private Data1D mGlowRadius; private Data4D mColor; -/////////////////////////////////////////////////////////////////////////////////////////////////// + private static final float GAUSSIAN[] = // G(0.00), G(0.03), G(0.06), ..., G(3.00), 0 + { // where G(x)= (1/(sqrt(2*PI))) * e^(-(x^2)/2). The last 0 terminates. + 0.398948f, 0.398769f, 0.398231f, 0.397336f, 0.396086f, 0.394485f, 0.392537f, 0.390247f, 0.387622f, 0.384668f, + 0.381393f, 0.377806f, 0.373916f, 0.369733f, 0.365268f, 0.360532f, 0.355538f, 0.350297f, 0.344823f, 0.339129f, + 0.333229f, 0.327138f, 0.320868f, 0.314436f, 0.307856f, 0.301142f, 0.294309f, 0.287373f, 0.280348f, 0.273248f, + 0.266089f, 0.258884f, 0.251648f, 0.244394f, 0.237135f, 0.229886f, 0.222657f, 0.215461f, 0.208311f, 0.201217f, + 0.194189f, 0.187238f, 0.180374f, 0.173605f, 0.166940f, 0.160386f, 0.153951f, 0.147641f, 0.141462f, 0.135420f, + 0.129520f, 0.123765f, 0.118159f, 0.112706f, 0.107408f, 0.102266f, 0.097284f, 0.092461f, 0.087797f, 0.083294f, + 0.078951f, 0.074767f, 0.070741f, 0.066872f, 0.063158f, 0.059596f, 0.056184f, 0.052920f, 0.049801f, 0.046823f, + 0.043984f, 0.041280f, 0.038707f, 0.036262f, 0.033941f, 0.031740f, 0.029655f, 0.027682f, 0.025817f, 0.024056f, + 0.022395f, 0.020830f, 0.019357f, 0.017971f, 0.016670f, 0.015450f, 0.014305f, 0.013234f, 0.012232f, 0.011295f, + 0.010421f, 0.009606f, 0.008847f, 0.008140f, 0.007483f, 0.006873f, 0.006307f, 0.005782f, 0.005296f, 0.004847f, + 0.004432f, 0.000000f + }; + private static final int NUM_GAUSSIAN = GAUSSIAN.length-2; - public static void enable() - { + // The (fixed-function-sampled) Gaussian Blur kernels are of the size k0=1, k1=2, k2=2, k3=3, k4=3, k5=4, k6=4,... + // i.e. k(i)=floor((i+3)/2). (the 'i' in k(i) means 'blur taking into account the present pixel and 'i' pixels + // in all 4 directions) + // We need room for MAX_BLUR of them, and sum(i=0...N, floor((i+3)/2)) = N + floor(N*N/4) + private static float[] weightsCache = new float[MAX_HALO + MAX_HALO*MAX_HALO/4]; + private static float[] offsetsCache = new float[MAX_HALO + MAX_HALO*MAX_HALO/4]; + private static float[] mWeights = new float[MAX_HALO]; + private static float[] mOffsets = new float[MAX_HALO]; - } + private static DistortedProgram mProgram1, mProgram2; + private static int mIndex1, mIndex2; /////////////////////////////////////////////////////////////////////////////////////////////////// + /** * Make the object glow with a specific color and a halo of specific radius. * @@ -64,6 +92,190 @@ public class PostprocessEffectGlow extends PostprocessEffect public int apply(float[] uniforms, int index, float qualityScale, DistortedFramebuffer buffer) { - return 0; + if( mProgram1 ==null) + { + mProgram1 = mPrograms.get(mIndex1); + mProgram2 = mPrograms.get(mIndex2); + } + + buffer.setAsOutput(); + + float w1 = buffer.getWidth(); + float h1 = buffer.getHeight(); + float near= 1.0f - buffer.getNear(); + + int radius = (int)(uniforms[index]*qualityScale); + if( radius>=MAX_HALO ) radius = MAX_HALO-1; + computeGaussianKernel(radius); + + int offset = radius + radius*radius/4; + radius = (radius+1)/2; + GLES30.glViewport(0, 0, (int)w1, (int)h1); + + // horizontal blur + for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]/h1; + + mProgram1.useProgram(); + buffer.bindForOutput(1); + buffer.setAsInput(0); + + GLES30.glUniform1f ( mProgram1.mUniform[0] , near); + GLES30.glUniform1i ( mProgram1.mUniform[1] , 0 ); + GLES30.glUniform1fv( mProgram1.mUniform[2] , radius+1, mOffsets,0); + GLES30.glUniform1fv( mProgram1.mUniform[3] , radius+1, weightsCache,offset); + GLES30.glUniform1i ( mProgram1.mUniform[4] , radius); + + GLES30.glVertexAttribPointer(mProgram1.mAttribute[0], POS_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadPositions); + GLES30.glVertexAttribPointer(mProgram1.mAttribute[1], TEX_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadTexture); + + DistortedRenderState.useStencilMark(); + GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, 0, 4); + DistortedRenderState.unuseStencilMark(); + GLES30.glActiveTexture(GLES30.GL_TEXTURE0); + GLES30.glBindTexture(GLES30.GL_TEXTURE_2D, 0); + + // vertical blur + for(int i=0; i<=radius; i++) mOffsets[i] = offsetsCache[offset+i]/w1; + + mProgram2.useProgram(); + buffer.bindForOutput(0); + buffer.setAsInput(1); + + GLES30.glColorMask(true,true,true,true); + GLES30.glClearColor(0.0f,0.0f,0.0f,0.0f); + GLES30.glClear(GLES30.GL_COLOR_BUFFER_BIT); + + GLES30.glUniform1f ( mProgram2.mUniform[0] , near); + GLES30.glUniform1i ( mProgram2.mUniform[1] , 0 ); + GLES30.glUniform1fv( mProgram2.mUniform[2] , radius+1, mOffsets,0); + GLES30.glUniform1fv( mProgram2.mUniform[3] , radius+1, weightsCache,offset); + GLES30.glUniform1i ( mProgram2.mUniform[4] , radius); + + GLES30.glVertexAttribPointer(mProgram2.mAttribute[0], POS_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadPositions); + GLES30.glVertexAttribPointer(mProgram2.mAttribute[1], TEX_DATA_SIZE, GLES30.GL_FLOAT, false, 0, mQuadTexture); + + DistortedRenderState.useStencilMark(); + GLES30.glDrawArrays(GLES30.GL_TRIANGLE_STRIP, 0, 4); + DistortedRenderState.unuseStencilMark(); + GLES30.glActiveTexture(GLES30.GL_TEXTURE0); + GLES30.glBindTexture(GLES30.GL_TEXTURE_2D, 0); + + return 2; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void enable() + { + final String glowVertex = + + "#version 300 es \n"+ + "precision lowp float; \n"+ + "in vec2 a_Position; \n"+ + "in vec2 a_TexCoord; \n"+ + "out vec2 v_TexCoord; \n"+ + "uniform float u_Depth; \n"+ + + "void main() \n"+ + " { \n"+ + " v_TexCoord = a_TexCoord; \n"+ + " gl_Position= vec4(2.0*a_Position,u_Depth,1.0); \n"+ + " }"; + + final String glowFragment1 = + + "#version 300 es \n"+ + "#define MAX_BLUR "+MAX_HALO+ "\n"+ + "precision lowp float; \n"+ + "in vec2 v_TexCoord; \n"+ + "out vec4 fragColor; \n"+ + "uniform sampler2D u_ColorTexture; \n"+ + "uniform float u_Offsets[MAX_BLUR]; \n"+ + "uniform float u_Weights[MAX_BLUR]; \n"+ + "uniform int u_Radius; \n"+ + + "void main() \n"+ + " { \n"+ + " vec4 pixel= texture(u_ColorTexture,v_TexCoord) * u_Weights[0]; \n"+ + " for (int i=1; i<=u_Radius; i+=1) \n"+ + " { \n"+ + " pixel += ( texture(u_ColorTexture,vec2(v_TexCoord.x+u_Offsets[i],v_TexCoord.y)) + \n"+ + " texture(u_ColorTexture,vec2(v_TexCoord.x-u_Offsets[i],v_TexCoord.y)) ) * u_Weights[i]; \n"+ + " } \n"+ + " fragColor = pixel; \n"+ + " }"; + + final String glowFragment2 = + + "#version 300 es \n"+ + "#define MAX_BLUR "+MAX_HALO+ "\n"+ + "precision lowp float; \n"+ + "in vec2 v_TexCoord; \n"+ + "out vec4 fragColor; \n"+ + "uniform sampler2D u_ColorTexture; \n"+ + "uniform float u_Offsets[MAX_BLUR]; \n"+ + "uniform float u_Weights[MAX_BLUR]; \n"+ + "uniform int u_Radius; \n"+ + + "void main() \n"+ + " { \n"+ + " vec4 pixel= texture(u_ColorTexture,v_TexCoord) * u_Weights[0]; \n"+ + " for (int i=1; i<=u_Radius; i+=1) \n"+ + " { \n"+ + " pixel += ( texture(u_ColorTexture,vec2(v_TexCoord.x,v_TexCoord.y+u_Offsets[i])) + \n"+ + " texture(u_ColorTexture,vec2(v_TexCoord.x,v_TexCoord.y-u_Offsets[i])) ) * u_Weights[i]; \n"+ + " } \n"+ + " fragColor = pixel; \n"+ + " }"; + + mIndex1 = PostprocessEffect.register("BLUR1", glowVertex,glowFragment1); + mIndex2 = PostprocessEffect.register("BLUR2", glowVertex,glowFragment2); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// This implements the 'Better separable implementation using GPU fixed function sampling' from +// https://software.intel.com/en-us/blogs/2014/07/15/an-investigation-of-fast-real-time-gpu-based-image-blur-algorithms + + private void computeGaussianKernel(int radius) + { + int offset = radius + radius*radius/4; + + if( weightsCache[offset]==0.0f ) + { + float z, x= 0.0f, P= (float)NUM_GAUSSIAN / (radius>3 ? radius:3); + mWeights[0] = GAUSSIAN[0]; + float sum = GAUSSIAN[0]; + int j; + + for(int i=1; i<=radius; i++) + { + x += P; + j = (int)x; + z = x-j; + + mWeights[i] = (1-z)*GAUSSIAN[j] + z*GAUSSIAN[j+1]; + sum += 2*mWeights[i]; + } + + for(int i=0; i<=radius; i++) mWeights[i] /= sum; + + int numloops = radius/2; + weightsCache[offset] = mWeights[0]; + offsetsCache[offset] = 0.0f; + + for(int i=0; i0 ) { @@ -125,6 +125,10 @@ abstract class EffectQueue implements DistortedSlave { mID = 0; } + + int numNodes = (mNodes==null ? 0: mNodes.size()); + for(int i=0; i