From d4eb7ea88185ed848b2d2c2aba5e7f228d07398c Mon Sep 17 00:00:00 2001 From: oahc09 Date: Thu, 2 Feb 2023 13:36:32 +0800 Subject: [PATCH] fix:xr video player bug (#14121) * fix:xr video player compatibility on some devices shader compile error * fix:release video player framebuffer --- .../libcocosxr/src/com/cocos/lib/xr/CocosXRGLHelper.java | 4 ++-- .../libcocosxr/src/com/cocos/lib/xr/CocosXRVideoManager.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRGLHelper.java b/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRGLHelper.java index 6a79be134f..4bfabb184d 100644 --- a/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRGLHelper.java +++ b/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRGLHelper.java @@ -145,10 +145,10 @@ public class CocosXRGLHelper { + "precision mediump float; \n" + "in vec2 texCoord; \n" + "uniform samplerExternalOES texSampler2D; \n" - + "out vec4 gl_FragColor;\n" + + "out vec4 frag_color;\n" + "void main() \n" + "{ \n" - + " gl_FragColor = texture(texSampler2D, texCoord); \n" + + " frag_color = texture(texSampler2D, texCoord); \n" + "}"; float[] orthoQuadVertices = { -1.0f, -1.0f, 0.0f, 1.0f, diff --git a/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRVideoManager.java b/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRVideoManager.java index 6610cde6d7..640213c333 100644 --- a/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRVideoManager.java +++ b/native/cocos/platform/android/libcocosxr/src/com/cocos/lib/xr/CocosXRVideoManager.java @@ -421,6 +421,7 @@ public class CocosXRVideoManager { for (Map.Entry entrySet : entrySets) { entrySet.getValue().onGLDestroy(); } + GLES30.glDeleteFramebuffers(1, new int[] {renderTargetFboId}, 0); EGL14.eglMakeCurrent(eglDisplay, EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT); EGL14.eglDestroySurface(eglDisplay, pBufferSurface); EGL14.eglDestroyContext(eglDisplay, eglContext);