finish work of: #510

Author: wysaid

cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java

@@ -28,8 +28,8 @@ public class MainActivity extends AppCompatActivity {
 
     public static final String EFFECT_CONFIGS[] = {
             "",
-            "@style waveform 0.5 0.5 200. 150. 0.0 0.0 0.0 0.9",
-            "@style hist 0.5 0.5 200. 150. 0.0 0.0 0.0 ",
+            "@style waveform 0.01 0.01 0.4 0.4 0.0 0.0 0.0 0.9",
+            "@style hist 0.5 0.5 0.5 0.5 0.0 0.0 0.0 ",
             "@curve RGB(0,255)(255,0) @style cm mapping0.jpg 80 80 8 3", // ASCII art (字符画效果)
             "@beautify face 1 480 640", //Beautify
             "@adjust lut edgy_amber.png",

library/src/main/jni/cge/common/cgeCommonDefine.cpp

@@ -300,14 +300,26 @@ GLuint cgeGenTextureWithBuffer(const void* bufferData, GLint w, GLint h, GLenum
     assert(w != 0 && h != 0);
     GLuint tex;
     static const GLenum eArrs[] = { GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA };
+    static const GLenum eArrsSized8[] = { GL_R8, GL_RG8, GL_RGB8, GL_RGBA8 };
     if (channel <= 0 || channel > 4)
         return 0;
     const GLenum& internalFormat = eArrs[channel - 1];
     glActiveTexture(GL_TEXTURE0 + bindID);
     glGenTextures(1, &tex);
     glBindTexture(GL_TEXTURE_2D, tex);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+#ifdef ANDROID_NDK
+    if (bufferData == nullptr && dataFmt == GL_UNSIGNED_BYTE)
+    {
+        glTexStorage2D(GL_TEXTURE_2D, 1, eArrsSized8[channel - 1], w, h);
+    }
+    else
+    {
+        glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, channelFmt, dataFmt, bufferData);
+    }
+#else
     glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, channelFmt, dataFmt, bufferData);
+#endif
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, texFilter);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, texFilter);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, texWrap);

library/src/main/jni/cge/filters/cgeWaveformFilter.cpp

@@ -2,26 +2,31 @@
 
 #include <EGL/egl.h>
 
-static CGEConstString s_vshWaveform = "#version 310 es\n" CGE_SHADER_STRING_PRECISION_H(
+static CGEConstString s_vshWaveform = "#version 320 es\n" CGE_SHADER_STRING_PRECISION_H(
     layout(location = 0) in vec2 position;
     layout(location = 0) out vec2 textureCoordinate;
     void main() {
         gl_Position = vec4(position, 0.0, 1.0);
         textureCoordinate = (position.xy + 1.0) / 2.0;
     });
 
-static CGEConstString s_fshWaveform = "#version 310 es\n" CGE_SHADER_STRING(
+static CGEConstString s_fshWaveform = "#version 320 es\n" CGE_SHADER_STRING(
     precision highp float;
     precision highp int;
     layout(location = 0) in vec2 textureCoordinate;
     layout(binding = 0) uniform sampler2D inputImageTexture;
-    layout(rgba8, binding = 1) uniform writeonly image2D outputImageTexture;
+    layout(rgba8ui, binding = 1) uniform writeonly highp uimage2D outputImage;
     layout(location = 0) out vec4 fragColor;
 
     void main() {
-        fragColor = texture(inputImageTexture, textureCoordinate);
+        fragColor = vec4(1.0);
+        vec4 color = texture(inputImageTexture, textureCoordinate);
+        float lum = dot(color.rgb, vec3(0.299, 0.587, 0.114));
+        ivec2 newLoc = ivec2(vec2(textureCoordinate.x, lum) * vec2(imageSize(outputImage)));
+        uint newLum = uint(lum * 255.0);
+        imageStore(outputImage, newLoc, uvec4(newLum, newLum, newLum, 255));
 
-        fragColor.r = 1.0;
+        // TODO: 考虑使用 imageAtomicAdd 保障原子操作 (不闪屏)
     });
 
 namespace CGE
@@ -34,10 +39,12 @@ bool CGEWaveformFilter::init()
 {
     if (initShadersFromString(s_vshWaveform, s_fshWaveform))
     {
-        setFormPosition(0.5f, 0.5f);
-        setFormSize(0.4f, 0.3f);
+        m_program.bind();
+        setFormPosition(0.1f, 0.1f);
+        setFormSize(0.3f, 0.3f);
         setColor(0.0f, 0.0f, 0.0f, 0.5f);
         m_drawer.reset(TextureDrawer::create());
+        m_drawer->setFlipScale(1.0f, -1.0f); // flip upside down, meet the gl coord.
         return true;
     }
 
@@ -53,20 +60,31 @@ bool CGEWaveformFilter::init()
 void CGEWaveformFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint srcTexture, GLuint vertexBufferID)
 {
     handler->setAsTarget();
+    glClear(GL_COLOR_BUFFER_BIT);
     m_program.bind();
 
     /// 渲染不写入, 使用 imageStore 写入.
-    // glColorMask(false, false, false, false);
+    glColorMask(false, false, false, false);
 
+    glBindBuffer(GL_ARRAY_BUFFER, vertexBufferID);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
     glActiveTexture(GL_TEXTURE0);
-    // glBindImageTexture(0, srcTexture, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
     glBindTexture(GL_TEXTURE_2D, srcTexture);
-    // glActiveTexture(GL_TEXTURE1);
-    // glBindImageTexture(1, handler->getTargetTextureID(), 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
-    // glBindTexture(GL_TEXTURE_2D, handler->getTargetTextureID());
+
+    glActiveTexture(GL_TEXTURE1);
+    glBindTexture(GL_TEXTURE_2D, 0);
+    glBindImageTexture(1, handler->getTargetTextureID(), 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8UI);
+
     glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+    glColorMask(true, true, true, true);
+    glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
+
+    handler->swapBufferFBO();
+    handler->setAsTarget();
+    auto&& sz = handler->getOutputFBOSize();
+    glViewport(m_position[0] * sz.width, m_position[1] * sz.height, m_size[0] * sz.width, m_size[1] * sz.height);
+    m_drawer->drawTexture(handler->getBufferTextureID());
 }
 
 void CGEWaveformFilter::setFormPosition(float left, float top)