drm_hwcomposer: Add DrmEventListener worker

[android-x86/external-drm_hwcomposer.git] / autogl.h

diff --git a/autogl.h b/autogl.h
index 5d25e44..fc77fb0 100644 (file)
--- a/autogl.h
+++ b/autogl.h
@@ -52,8 +52,7 @@ AUTO_GL_TYPE(AutoGLShader, GLint, 0, glDeleteShader(p))
 AUTO_GL_TYPE(AutoGLProgram, GLint, 0, glDeleteProgram(p))
 
 struct AutoEGLDisplayImage {
-  AutoEGLDisplayImage() : display_(EGL_NO_DISPLAY), image_(EGL_NO_IMAGE_KHR) {
-  }
+  AutoEGLDisplayImage() = default;
 
   AutoEGLDisplayImage(EGLDisplay display, EGLImageKHR image)
       : display_(display), image_(image) {
@@ -61,9 +60,10 @@ struct AutoEGLDisplayImage {
 
   AutoEGLDisplayImage(const AutoEGLDisplayImage& rhs) = delete;
   AutoEGLDisplayImage(AutoEGLDisplayImage&& rhs) {
-    clear();
-    std::swap(display_, rhs.display_);
-    std::swap(image_, rhs.image_);
+    display_ = rhs.display_;
+    image_ = rhs.image_;
+    rhs.display_ = EGL_NO_DISPLAY;
+    rhs.image_ = EGL_NO_IMAGE_KHR;
   }
 
   ~AutoEGLDisplayImage() {
@@ -97,8 +97,8 @@ struct AutoEGLDisplayImage {
   }
 
  private:
-  EGLDisplay display_;
-  EGLImageKHR image_;
+  EGLDisplay display_ = EGL_NO_DISPLAY;
+  EGLImageKHR image_ = EGL_NO_IMAGE_KHR;
 };
 
 struct AutoEGLImageAndGLTexture {