diff --git a/library/src/main/java/org/wysaid/common/TextureDrawer.java b/library/src/main/java/org/wysaid/common/TextureDrawer.java index 0ed7c0f9..2d4b6850 100644 --- a/library/src/main/java/org/wysaid/common/TextureDrawer.java +++ b/library/src/main/java/org/wysaid/common/TextureDrawer.java @@ -33,8 +33,8 @@ public class TextureDrawer { " gl_FragColor = texture2D(inputImageTexture, texCoord);\n" + "}"; - public static final float[] vertices = {-1.0f, -1.0f, 1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f}; - public static final int DRAW_FUNCTION = GLES20.GL_TRIANGLE_FAN; + public static final float[] vertices = {-1.0f, -1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f, 1.0f}; + public static final int DRAW_FUNCTION = GLES20.GL_TRIANGLE_STRIP; protected ProgramObject mProgram; protected int mVertBuffer; diff --git a/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerI420ToRGB.java b/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerI420ToRGB.java index affac19b..e40850b3 100644 --- a/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerI420ToRGB.java +++ b/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerI420ToRGB.java @@ -62,7 +62,7 @@ public void drawTextures() { GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, mVertBuffer); GLES20.glEnableVertexAttribArray(0); GLES20.glVertexAttribPointer(0, 2, GLES20.GL_FLOAT, false, 0, 0); - GLES20.glDrawArrays(GLES20.GL_TRIANGLE_FAN, 0, 4); + GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4); } public void drawTextures(int texY, int texU, int texV) { diff --git a/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerNV21ToRGB.java b/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerNV21ToRGB.java index 64ff4e59..96fbc76e 100644 --- a/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerNV21ToRGB.java +++ b/library/src/main/java/org/wysaid/gpuCodec/TextureDrawerNV21ToRGB.java @@ -59,7 +59,7 @@ public void drawTextures() { GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, mVertBuffer); GLES20.glEnableVertexAttribArray(0); GLES20.glVertexAttribPointer(0, 2, GLES20.GL_FLOAT, false, 0, 0); - GLES20.glDrawArrays(GLES20.GL_TRIANGLE_FAN, 0, 4); + GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4); } public void drawTextures(int texY, int texUV) { diff --git a/library/src/main/java/org/wysaid/texUtils/TextureRenderer.java b/library/src/main/java/org/wysaid/texUtils/TextureRenderer.java index eaaa7106..5f9a6088 100644 --- a/library/src/main/java/org/wysaid/texUtils/TextureRenderer.java +++ b/library/src/main/java/org/wysaid/texUtils/TextureRenderer.java @@ -77,8 +77,8 @@ public Viewport(int _x, int _y, int _width, int _height) { protected static final String FLIPSCALE_NAME = "flipScale"; protected static final String TRANSFORM_NAME = "transform"; - public static final float[] vertices = {-1.0f, -1.0f, 1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f}; - public static final int DRAW_FUNCTION = GLES20.GL_TRIANGLE_FAN; + public static final float[] vertices = {-1.0f, -1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f, 1.0f}; + public static final int DRAW_FUNCTION = GLES20.GL_TRIANGLE_STRIP; protected int TEXTURE_2D_BINDABLE; diff --git a/library/src/main/jni/cge/common/cgeGlobal.cpp b/library/src/main/jni/cge/common/cgeGlobal.cpp index 97ed3f91..ed906496 100644 --- a/library/src/main/jni/cge/common/cgeGlobal.cpp +++ b/library/src/main/jni/cge/common/cgeGlobal.cpp @@ -30,7 +30,7 @@ bool g_shouldUsePBO = true; int CGEGlobalConfig::viewWidth = 1024; int CGEGlobalConfig::viewHeight = 768; GLuint CGEGlobalConfig::sVertexBufferCommon = 0; -float CGEGlobalConfig::sVertexDataCommon[8] = { -1.0f, -1.0f, 1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f }; +float CGEGlobalConfig::sVertexDataCommon[8] = { -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f, 1.0f }; void cgeInitFilterStatus() { diff --git a/library/src/main/jni/cge/common/cgeImageFilter.cpp b/library/src/main/jni/cge/common/cgeImageFilter.cpp index 40663bbf..1c26a027 100644 --- a/library/src/main/jni/cge/common/cgeImageFilter.cpp +++ b/library/src/main/jni/cge/common/cgeImageFilter.cpp @@ -177,7 +177,7 @@ void CGEImageFilterInterface::render2Texture(CGEImageHandlerInterface* handler, if (m_uniformParam != nullptr) m_uniformParam->assignUniforms(handler, m_program.programID()); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } diff --git a/library/src/main/jni/cge/common/cgeTextureUtils.cpp b/library/src/main/jni/cge/common/cgeTextureUtils.cpp index b7f22306..b0be377e 100644 --- a/library/src/main/jni/cge/common/cgeTextureUtils.cpp +++ b/library/src/main/jni/cge/common/cgeTextureUtils.cpp @@ -419,7 +419,7 @@ void TextureDrawer::drawTexture(GLuint src) glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, 0); m_program.bind(); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } void TextureDrawer::setRotation(float rad) @@ -590,7 +590,7 @@ void TextureDrawer4ExtOES::drawTexture(GLuint src) glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, 0); m_program.bind(); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } #endif @@ -622,7 +622,7 @@ void TextureDrawerYUV::drawTextures() glBindBuffer(GL_ARRAY_BUFFER, m_vertBuffer); glEnableVertexAttribArray(0); glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, 0); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } CGEConstString TextureDrawerYUV::getFragmentShaderString() @@ -765,7 +765,7 @@ void CGELerpBlurUtil::calcWithTexture(GLuint texture, int width, int height, GLu m_framebuffer.bindTexture2D(m_texCache[0].texID); glBindTexture(GL_TEXTURE_2D, texture); glViewport(0, 0, m_texCache[0].size.width, m_texCache[0].size.height); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glFlush(); // down scale @@ -776,7 +776,7 @@ void CGELerpBlurUtil::calcWithTexture(GLuint texture, int width, int height, GLu glViewport(0, 0, texCache.size.width, texCache.size.height); glBindTexture(GL_TEXTURE_2D, m_texCache[i - 1].texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glFlush(); } @@ -788,7 +788,7 @@ void CGELerpBlurUtil::calcWithTexture(GLuint texture, int width, int height, GLu glViewport(0, 0, texCache.size.width, texCache.size.height); glBindTexture(GL_TEXTURE_2D, m_texCache[i].texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glFlush(); } @@ -797,7 +797,7 @@ void CGELerpBlurUtil::calcWithTexture(GLuint texture, int width, int height, GLu m_framebuffer.bindTexture2D(target); glViewport(0, 0, targetWidth, targetHeight); glBindTexture(GL_TEXTURE_2D, m_texCache[0].texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } } @@ -809,7 +809,7 @@ void CGELerpBlurUtil::drawTexture(GLuint texID) glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } void CGELerpBlurUtil::_clearMipmaps() diff --git a/library/src/main/jni/cge/filters/cgeAdvancedEffectsCommon.cpp b/library/src/main/jni/cge/filters/cgeAdvancedEffectsCommon.cpp index 4e7c1e68..701a4612 100644 --- a/library/src/main/jni/cge/filters/cgeAdvancedEffectsCommon.cpp +++ b/library/src/main/jni/cge/filters/cgeAdvancedEffectsCommon.cpp @@ -28,7 +28,7 @@ void CGEAdvancedEffectOneStepFilterHelper::render2Texture(CGEImageHandlerInterfa CGESizei sz = handler->getOutputFBOSize(); m_program.sendUniformf(paramStepsName, 1.0f / sz.width, 1.0f / sz.height); } - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } @@ -51,7 +51,7 @@ void CGEAdvancedEffectTwoStepFilterHelper::render2Texture(CGEImageHandlerInterfa glBindTexture(GL_TEXTURE_2D, srcTexture); m_program.sendUniformf(paramStepsName, 0.0f, 1.0f / sz.height); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } // Pass Two handler->swapBufferFBO(); @@ -61,7 +61,7 @@ void CGEAdvancedEffectTwoStepFilterHelper::render2Texture(CGEImageHandlerInterfa glBindTexture(GL_TEXTURE_2D, handler->getBufferTextureID()); m_program.sendUniformf(paramStepsName, 1.0f / sz.width, 0.0f); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } } // namespace CGE \ No newline at end of file diff --git a/library/src/main/jni/cge/filters/cgeBlendFilter.cpp b/library/src/main/jni/cge/filters/cgeBlendFilter.cpp index d25890b0..5b5e20ba 100644 --- a/library/src/main/jni/cge/filters/cgeBlendFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeBlendFilter.cpp @@ -921,7 +921,7 @@ void CGEBlendTileFilter::render2Texture(CGEImageHandlerInterface* handler, GLuin if (m_uniformParam != nullptr) m_uniformParam->assignUniforms(handler, m_program.programID()); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } diff --git a/library/src/main/jni/cge/filters/cgeDynamicWaveFilter.cpp b/library/src/main/jni/cge/filters/cgeDynamicWaveFilter.cpp index dee7f59a..16d584d3 100644 --- a/library/src/main/jni/cge/filters/cgeDynamicWaveFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeDynamicWaveFilter.cpp @@ -68,7 +68,7 @@ void CGEDynamicWaveFilter::render2Texture(CGEImageHandlerInterface* handler, GLu if (m_uniformParam != nullptr) m_uniformParam->assignUniforms(handler, m_program.programID()); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } diff --git a/library/src/main/jni/cge/filters/cgeHalftoneFilter.cpp b/library/src/main/jni/cge/filters/cgeHalftoneFilter.cpp index a3c350fd..c7e9e679 100644 --- a/library/src/main/jni/cge/filters/cgeHalftoneFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeHalftoneFilter.cpp @@ -69,7 +69,7 @@ void CGEHalftoneFilter::render2Texture(CGE::CGEImageHandlerInterface* handler, G float dotPercent = m_dotSize / sz.width; m_program.sendUniformf(paramAspectRatio, aspectRatio); m_program.sendUniformf(paramDotPercent, dotPercent, dotPercent / aspectRatio); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } } // namespace CGE \ No newline at end of file diff --git a/library/src/main/jni/cge/filters/cgeLerpblurFilter.cpp b/library/src/main/jni/cge/filters/cgeLerpblurFilter.cpp index 2c686b96..66fe59ba 100644 --- a/library/src/main/jni/cge/filters/cgeLerpblurFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeLerpblurFilter.cpp @@ -148,7 +148,7 @@ void CGELerpblurFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint m_framebuffer.bindTexture2D(m_texCache[0].texID); glBindTexture(GL_TEXTURE_2D, srcTexture); glViewport(0, 0, m_texCache[0].size.width, m_texCache[0].size.height); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glFlush(); // down scale @@ -159,7 +159,7 @@ void CGELerpblurFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint glViewport(0, 0, texCache.size.width, texCache.size.height); glBindTexture(GL_TEXTURE_2D, m_texCache[i - 1].texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glFlush(); } @@ -171,13 +171,13 @@ void CGELerpblurFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint glViewport(0, 0, texCache.size.width, texCache.size.height); glBindTexture(GL_TEXTURE_2D, m_texCache[i].texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glFlush(); } handler->setAsTarget(); glBindTexture(GL_TEXTURE_2D, m_texCache[0].texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } void CGELerpblurFilter::setMipmapBase(float value) diff --git a/library/src/main/jni/cge/filters/cgeMinValueFilter.cpp b/library/src/main/jni/cge/filters/cgeMinValueFilter.cpp index 786947ca..e27907b1 100644 --- a/library/src/main/jni/cge/filters/cgeMinValueFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeMinValueFilter.cpp @@ -205,7 +205,7 @@ void CGEMinValueFilter3x3::render2Texture(CGEImageHandlerInterface* handler, GLu glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, srcTexture); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } } // namespace CGE diff --git a/library/src/main/jni/cge/filters/cgeMotionFlowFilter.cpp b/library/src/main/jni/cge/filters/cgeMotionFlowFilter.cpp index 4d4b6a7d..708fc683 100644 --- a/library/src/main/jni/cge/filters/cgeMotionFlowFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeMotionFlowFilter.cpp @@ -127,12 +127,12 @@ void CGEMotionFlowFilter::render2Texture(CGEImageHandlerInterface* handler, GLui { glUniform1f(m_alphaLoc, alpha += m_dAlpha); glBindTexture(GL_TEXTURE_2D, texID); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } glUniform1f(m_alphaLoc, alpha += m_dAlpha); glBindTexture(GL_TEXTURE_2D, srcTexture); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDisable(GL_BLEND); diff --git a/library/src/main/jni/cge/filters/cgeMultipleEffects.cpp b/library/src/main/jni/cge/filters/cgeMultipleEffects.cpp index 084b0dd3..09281769 100644 --- a/library/src/main/jni/cge/filters/cgeMultipleEffects.cpp +++ b/library/src/main/jni/cge/filters/cgeMultipleEffects.cpp @@ -67,7 +67,7 @@ void CGEMutipleMixFilter::render2Texture(CGEImageHandlerInterface* handler, GLui glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, srcTexture); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } diff --git a/library/src/main/jni/cge/filters/cgeMultipleEffectsCommon.cpp b/library/src/main/jni/cge/filters/cgeMultipleEffectsCommon.cpp index 84bc6274..e74dc543 100644 --- a/library/src/main/jni/cge/filters/cgeMultipleEffectsCommon.cpp +++ b/library/src/main/jni/cge/filters/cgeMultipleEffectsCommon.cpp @@ -437,7 +437,7 @@ void CGELomoFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint src m_program.sendUniformf(paramSaturationName, sat); } - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } @@ -516,7 +516,7 @@ void CGELomoWithCurveFilter::render2Texture(CGEImageHandlerInterface* handler, G m_program.sendUniformf(paramSaturationName, sat); } - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } @@ -680,7 +680,7 @@ void CGEColorScaleFilter::render2Texture(CGEImageHandlerInterface* handler, GLui m_program.sendUniformf(paramColorScaleName, colorScale[0], colorScale[1]); } - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } diff --git a/library/src/main/jni/cge/filters/cgeSharpenBlurAdjust.cpp b/library/src/main/jni/cge/filters/cgeSharpenBlurAdjust.cpp index 570297e7..cb867f21 100644 --- a/library/src/main/jni/cge/filters/cgeSharpenBlurAdjust.cpp +++ b/library/src/main/jni/cge/filters/cgeSharpenBlurAdjust.cpp @@ -237,13 +237,13 @@ void CGESharpenBlurFilter::render2Texture(CGEImageHandlerInterface* handler, GLu handler->setAsTarget(); glBindTexture(GL_TEXTURE_2D, srcTexture); m_program.sendUniformf(paramBlurNormalName, 0.0f, 1.0f); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); // Pass Two handler->swapBufferFBO(); glBindTexture(GL_TEXTURE_2D, handler->getBufferTextureID()); m_program.sendUniformf(paramBlurNormalName, 1.0f, 0.0f); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } ////////////////////////////////////////////////////////////////////////// @@ -286,13 +286,13 @@ void CGEBlurFastFilter::render2Texture(CGEImageHandlerInterface* handler, GLuint handler->setAsTarget(); glBindTexture(GL_TEXTURE_2D, handler->getBufferTextureID()); m_program.sendUniformf(paramBlurNormalName, 0.0f, 1.0f); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); // Pass Two glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, dstTexture, 0); glBindTexture(GL_TEXTURE_2D, handler->getTargetTextureID()); m_program.sendUniformf(paramBlurNormalName, 1.0f, 0.0f); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } void CGEBlurFastFilter::setSamplerScale(int value) diff --git a/library/src/main/jni/cge/filters/cgeSketchFilter.cpp b/library/src/main/jni/cge/filters/cgeSketchFilter.cpp index a51d2876..020a2810 100644 --- a/library/src/main/jni/cge/filters/cgeSketchFilter.cpp +++ b/library/src/main/jni/cge/filters/cgeSketchFilter.cpp @@ -93,11 +93,11 @@ void CGESketchFilter::render2Texture(CGE::CGEImageHandlerInterface* handler, GLu glBindTexture(GL_TEXTURE_2D, srcTexture); glUniform2f(m_maxValueFilter.getStepsLocation(), 1.0f / sz.width, 1.0f / sz.height); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); // // glBindTexture(GL_TEXTURE_2D, handler->getTargetTextureID()); - // glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + // glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, handler->getTargetTextureID(), 0); @@ -113,7 +113,7 @@ void CGESketchFilter::render2Texture(CGE::CGEImageHandlerInterface* handler, GLu glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, m_textureCache); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); cgeCheckGLError("glDrawArrays"); } diff --git a/library/src/main/jni/custom/cgeMultiInputFilter.cpp b/library/src/main/jni/custom/cgeMultiInputFilter.cpp index e34b5628..b6d522a5 100644 --- a/library/src/main/jni/custom/cgeMultiInputFilter.cpp +++ b/library/src/main/jni/custom/cgeMultiInputFilter.cpp @@ -42,7 +42,7 @@ void CGEMultiInputFilter::render2Texture(CGEImageHandlerInterface* handler, GLui } } - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } void CGEMultiInputFilter::updateInputTextures(GLuint* textures, int count) diff --git a/library/src/main/jni/custom/customFilter_0.cpp b/library/src/main/jni/custom/customFilter_0.cpp index 32795217..043a49e7 100644 --- a/library/src/main/jni/custom/customFilter_0.cpp +++ b/library/src/main/jni/custom/customFilter_0.cpp @@ -81,5 +81,5 @@ void CustomFilter_0::render2Texture(CGEImageHandlerInterface* handler, GLuint sr glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, srcTexture); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } diff --git a/library/src/main/jni/interface/cgeVideoPlayer.cpp b/library/src/main/jni/interface/cgeVideoPlayer.cpp index 80f144b6..d93f471a 100644 --- a/library/src/main/jni/interface/cgeVideoPlayer.cpp +++ b/library/src/main/jni/interface/cgeVideoPlayer.cpp @@ -203,7 +203,7 @@ void CGEVideoPlayerYUV420P::render() glBindBuffer(GL_ARRAY_BUFFER, m_vertexBuffer); glEnableVertexAttribArray(m_posAttribLocation); glVertexAttribPointer(m_posAttribLocation, 2, GL_FLOAT, GL_FALSE, 0, 0); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); } void CGEVideoPlayerYUV420P::setRotation(float rad)