Mesa (master): egl/haiku: minor surface management cleanups

Emil Velikov evelikov at kemper.freedesktop.org
Fri Jun 12 14:43:40 UTC 2015


Module: Mesa
Branch: master
Commit: e77a32fcaed30815d0f95e0d05432e8637ab0f3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e77a32fcaed30815d0f95e0d05432e8637ab0f3e

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Jun 11 12:33:55 2015 +0100

egl/haiku: minor surface management cleanups

Drop the stub/unused function haiku_create_surface() and add some basic implementation for destroy_surface()

Cc: Alexander von Gluck IV <kallisti5 at unixzen.com>
Acked-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/egl/drivers/haiku/egl_haiku.cpp |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
index 2933acc..154b3af 100644
--- a/src/egl/drivers/haiku/egl_haiku.cpp
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -80,17 +80,6 @@ struct haiku_egl_surface
  * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
  */
 static _EGLSurface *
-haiku_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
-	_EGLConfig *conf, void *native_surface, const EGLint *attrib_list)
-{
-	return NULL;
-}
-
-
-/**
- * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
- */
-static _EGLSurface *
 haiku_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
 	_EGLConfig *conf, void *native_window, const EGLint *attrib_list)
 {
@@ -147,6 +136,10 @@ haiku_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp,
 static EGLBoolean
 haiku_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
 {
+	if (_eglPutSurface(surf)) {
+		// XXX: detach haiku_egl_surface::gl from the native window and destroy it
+		free(surf);
+        }
 	return EGL_TRUE;
 }
 




More information about the mesa-commit mailing list