Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f74d39d authored by Jan Sebechlebsky's avatar Jan Sebechlebsky
Browse files

Properly dispose of EGL resources 

Context and Surface should be destroyed before terminating display.
Call to eglTerminate caused bad memory access (bug in egl implementation),
and shouldn't be necessary so this cl removes that.

Also explicitly release vertex arrays in EglProgram.

Bug: 346736633
Test: atest virtual_camera_tests CtsVirtualDevicesCameraTestCases CtsVirtualDevicesCameraCtsTestCases
Change-Id: Ie5a2555391817de3a5446e25e50c9d85cf32cb65
parent 369b5e6f

services/camera/virtualcamera/util/EglDisplayContext.cc

+4 −4
Original line number Diff line number Diff line
@@ -93,16 +93,16 @@ EglDisplayContext::EglDisplayContext(std::shared_ptr<ANativeWindow> nativeWindow 
}



EglDisplayContext::~EglDisplayContext() {

  eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);

  if (mEglSurface != EGL_NO_SURFACE) {

    eglDestroySurface(mEglDisplay, mEglSurface);

  }

  if (mEglDisplay != EGL_NO_DISPLAY) {

    eglTerminate(mEglDisplay);

  }

  if (mEglContext != EGL_NO_CONTEXT) {

    eglDestroyContext(mEglDisplay, mEglContext);

  }

  eglReleaseThread();

  if (mEglDisplay != EGL_NO_DISPLAY) {

    eglTerminate(mEglDisplay);

  }

}



EGLDisplay EglDisplayContext::getEglDisplay() const {

services/camera/virtualcamera/util/EglProgram.cc

+9 −0
Original line number Diff line number Diff line
@@ -229,6 +229,15 @@ EglTestPatternProgram::EglTestPatternProgram() { 
                        kTextureCoords.size(), kTextureCoords.data());

}



EglTestPatternProgram::~EglTestPatternProgram() {

  if (mPositionHandle != -1) {

    glDisableVertexAttribArray(mPositionHandle);

  }

  if (mTextureCoordHandle != -1) {

    glDisableVertexAttribArray(mTextureCoordHandle);

  }

}



bool EglTestPatternProgram::draw(const std::chrono::nanoseconds timestamp) {

  // Load compiled shader.

  glUseProgram(mProgram);

services/camera/virtualcamera/util/EglProgram.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ class EglProgram { 
class EglTestPatternProgram : public EglProgram {

 public:

  EglTestPatternProgram();

  virtual ~EglTestPatternProgram();



  bool draw(std::chrono::nanoseconds timestamp);