diff options
author | “JKAST” <julian.kast@live.com> | 2022-04-11 16:00:27 -0400 |
---|---|---|
committer | “JKAST” <julian.kast@live.com> | 2022-04-11 16:00:27 -0400 |
commit | eea49e9854cefde3c4c2a8f95055410f6867640f (patch) | |
tree | 8c5c860245125655508fe88dccf7c887defe15dc | |
parent | eabf5cc9138663e5af3055c0beebaefcebea3b0f (diff) | |
download | sdl_android-eea49e9854cefde3c4c2a8f95055410f6867640f.tar.gz |
Add mEglCore release and set it to null in shutdown of VDE. And revert change in Texture2dProgram
-rw-r--r-- | android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java | 2 | ||||
-rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java b/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java index 3c2606dad..1faed6776 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java @@ -162,7 +162,7 @@ public class Texture2dProgram { if (mProgramHandle == 0) { throw new RuntimeException("Unable to create program"); } - Log.i(TAG,"Created program " + mProgramHandle + " (" + programType + ")"); + Log.e(TAG,"Created program " + mProgramHandle + " (" + programType + ")"); // get locations of attributes and uniforms diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java index 03586598e..0f6b6b02d 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java @@ -251,6 +251,10 @@ public class VirtualDisplayEncoder { inputSurface.release(); inputSurface = null; } + if (mEglCore != null) { + mEglCore.release(); + mEglCore = null; + } } catch (Exception ex) { DebugTool.logError(TAG, "shutDown() failed"); } |