X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmain%2Fegldisplay.c;h=565e44d2d23c8fc98d292aaa77983772042d2bdb;hb=b2ddb93ff3b8c88682634ccdef247967e31fab84;hp=feae1d6040942472970af6b00993d0dae6870d61;hpb=d09a19bf6e09eb0c8908e9b5378962ac17bcbc4c;p=mesa.git

diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index feae1d60409..565e44d2d23 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -10,189 +10,135 @@
 #include "egldisplay.h"
 #include "egldriver.h"
 #include "eglglobals.h"
-#include "eglhash.h"
-#include "eglstring.h"
 #include "eglmutex.h"
 #include "egllog.h"
 
 
-static _EGL_DECLARE_MUTEX(_eglDisplayInitMutex);
-static _EGLHashtable *_eglDisplayHash;
-/* TODO surface hash table should be per-display */
-static _EGLHashtable *_eglSurfaceHash;
-
-
 /**
- * Finish display management.
+ * Return the native platform by parsing EGL_PLATFORM.
  */
-static void
-_eglFiniDisplay(void)
+static _EGLPlatformType
+_eglGetNativePlatformFromEnv(void)
 {
-   _eglLockMutex(&_eglDisplayInitMutex);
-   if (_eglDisplayHash) {
-      EGLuint key = _eglHashFirstEntry(_eglDisplayHash);
-
-      while (key) {
-         _EGLDisplay *dpy = (_EGLDisplay *)
-            _eglHashLookup(_eglDisplayHash, key);
-         assert(dpy);
-
-         if (dpy->ContextList || dpy->SurfaceList)
-            _eglLog(_EGL_DEBUG, "Display %u is destroyed with resources", key);
-
-         _eglCleanupDisplay(dpy);
-         free(dpy);
+   /* map --with-egl-platforms names to platform types */
+   static const struct {
+      _EGLPlatformType platform;
+      const char *name;
+   } egl_platforms[_EGL_NUM_PLATFORMS] = {
+      { _EGL_PLATFORM_WINDOWS, "gdi" },
+      { _EGL_PLATFORM_X11, "x11" },
+      { _EGL_PLATFORM_DRM, "drm" },
+      { _EGL_PLATFORM_FBDEV, "fbdev" }
+   };
+   _EGLPlatformType plat = _EGL_INVALID_PLATFORM;
+   const char *plat_name;
+   EGLint i;
 
-         key = _eglHashNextEntry(_eglDisplayHash, key);
+   plat_name = getenv("EGL_PLATFORM");
+   /* try deprecated env variable */
+   if (!plat_name || !plat_name[0])
+      plat_name = getenv("EGL_DISPLAY");
+   if (!plat_name || !plat_name[0])
+      return _EGL_INVALID_PLATFORM;
+
+   for (i = 0; i < _EGL_NUM_PLATFORMS; i++) {
+      if (strcmp(egl_platforms[i].name, plat_name) == 0) {
+         plat = egl_platforms[i].platform;
+         break;
       }
-
-      _eglDeleteHashTable(_eglDisplayHash);
-      _eglDisplayHash = NULL;
-      _eglDeleteHashTable(_eglSurfaceHash);
-      _eglSurfaceHash = NULL;
    }
-   _eglUnlockMutex(&_eglDisplayInitMutex);
-}
-
 
-/* This can be avoided if hash table can be statically initialized */
-static INLINE void
-_eglInitDisplay(void)
-{
-   if (!_eglDisplayHash) {
-      _eglLockMutex(&_eglDisplayInitMutex);
-
-      /* check again after acquiring lock */
-      if (!_eglDisplayHash) {
-         _eglDisplayHash = _eglNewHashTable();
-         _eglSurfaceHash = _eglNewHashTable();
-
-         _eglAddAtExitCall(_eglFiniDisplay);
-      }
-
-      _eglUnlockMutex(&_eglDisplayInitMutex);
-   }
+   return plat;
 }
 
 
 /**
- * Allocate a new _EGLDisplay object for the given nativeDisplay handle.
- * We'll also try to determine the device driver name at this time.
- *
- * Note that nativeDisplay may be an X Display ptr, or a string.
+ * Return the native platform.  It is the platform of the EGL native types.
  */
-_EGLDisplay *
-_eglNewDisplay(NativeDisplayType nativeDisplay)
+_EGLPlatformType
+_eglGetNativePlatform(void)
 {
-   _EGLDisplay *dpy = (_EGLDisplay *) calloc(1, sizeof(_EGLDisplay));
-   if (dpy) {
-      dpy->NativeDisplay = nativeDisplay;
-#if defined(_EGL_PLATFORM_X)
-      dpy->Xdpy = (Display *) nativeDisplay;
-#endif
-
-      _eglInitDisplay();
-      dpy->SurfaceHash = _eglSurfaceHash;
-
-      dpy->DriverName = _eglChooseDriver(dpy);
-      if (!dpy->DriverName) {
-         free(dpy);
-         return NULL;
-      }
-   }
-   return dpy;
-}
+   static _EGLPlatformType native_platform = _EGL_INVALID_PLATFORM;
 
+   if (native_platform == _EGL_INVALID_PLATFORM) {
+      native_platform = _eglGetNativePlatformFromEnv();
+      if (native_platform == _EGL_INVALID_PLATFORM)
+         native_platform = _EGL_NATIVE_PLATFORM;
+   }
 
-/**
- * Link a display to itself and return the handle of the link.
- * The handle can be passed to client directly.
- */
-EGLDisplay
-_eglLinkDisplay(_EGLDisplay *dpy)
-{
-   EGLuint key;
-
-   _eglInitDisplay();
-
-   key = _eglHashGenKey(_eglDisplayHash);
-   assert(key);
-   /* "link" the display to the hash table */
-   _eglHashInsert(_eglDisplayHash, key, dpy);
-   dpy->Handle = (EGLDisplay) _eglUIntToPointer(key);
-
-   return dpy->Handle;
+   return native_platform;
 }
 
 
 /**
- * Unlink a linked display from itself.
- * Accessing an unlinked display should generate EGL_BAD_DISPLAY error.
+ * Finish display management.
  */
 void
-_eglUnlinkDisplay(_EGLDisplay *dpy)
+_eglFiniDisplay(void)
 {
-   EGLuint key = _eglPointerToUInt((void *) dpy->Handle);
+   _EGLDisplay *dpyList, *dpy;
 
-   _eglInitDisplay();
+   /* atexit function is called with global mutex locked */
+   dpyList = _eglGlobal.DisplayList;
+   while (dpyList) {
+      EGLint i;
 
-   _eglHashRemove(_eglDisplayHash, key);
-   dpy->Handle = EGL_NO_DISPLAY;
-}
+      /* pop list head */
+      dpy = dpyList;
+      dpyList = dpyList->Next;
 
+      for (i = 0; i < _EGL_NUM_RESOURCES; i++) {
+         if (dpy->ResourceLists[i]) {
+            _eglLog(_EGL_DEBUG, "Display %p is destroyed with resources", dpy);
+            break;
+         }
+      }
 
-/**
- * Return the handle of a linked display, or EGL_NO_DISPLAY.
- */
-EGLDisplay
-_eglGetDisplayHandle(_EGLDisplay *display)
-{
-   if (display)
-      return display->Handle;
-   else
-      return EGL_NO_DISPLAY;
+      free(dpy);
+   }
+   _eglGlobal.DisplayList = NULL;
 }
 
 
 /**
- * Lookup a handle to find the linked display.
- * Return NULL if the handle has no corresponding linked display.
+ * Find the display corresponding to the specified native display, or create a
+ * new one.
  */
 _EGLDisplay *
-_eglLookupDisplay(EGLDisplay dpy)
+_eglFindDisplay(_EGLPlatformType plat, void *plat_dpy)
 {
-   EGLuint key = _eglPointerToUInt((void *) dpy);
+   _EGLDisplay *dpy;
 
-   _eglInitDisplay();
-
-   return (_EGLDisplay *) _eglHashLookup(_eglDisplayHash, key);
-}
+   if (plat == _EGL_INVALID_PLATFORM)
+      return NULL;
 
+   _eglLockMutex(_eglGlobal.Mutex);
 
-/**
- * Find the display corresponding to the specified native display id in all
- * linked displays.
- */
-_EGLDisplay *
-_eglFindDisplay(NativeDisplayType nativeDisplay)
-{
-   EGLuint key;
-
-   _eglInitDisplay();
-
-   /* Walk the hash table.  Should switch to list if it is a problem. */
-   key = _eglHashFirstEntry(_eglDisplayHash);
-   while (key) {
-      _EGLDisplay *dpy = (_EGLDisplay *)
-            _eglHashLookup(_eglDisplayHash, key);
-      assert(dpy);
+   /* search the display list first */
+   dpy = _eglGlobal.DisplayList;
+   while (dpy) {
+      if (dpy->Platform == plat && dpy->PlatformDisplay == plat_dpy)
+         break;
+      dpy = dpy->Next;
+   }
 
-      if (dpy->NativeDisplay == nativeDisplay)
-         return dpy;
-      key = _eglHashNextEntry(_eglDisplayHash, key);
+   /* create a new display */
+   if (!dpy) {
+      dpy = (_EGLDisplay *) calloc(1, sizeof(_EGLDisplay));
+      if (dpy) {
+         _eglInitMutex(&dpy->Mutex);
+         dpy->Platform = plat;
+         dpy->PlatformDisplay = plat_dpy;
+
+         /* add to the display list */ 
+         dpy->Next = _eglGlobal.DisplayList;
+         _eglGlobal.DisplayList = dpy;
+      }
    }
 
-   return NULL;
+   _eglUnlockMutex(_eglGlobal.Mutex);
+
+   return dpy;
 }
 
 
@@ -200,31 +146,29 @@ _eglFindDisplay(NativeDisplayType nativeDisplay)
  * Destroy the contexts and surfaces that are linked to the display.
  */
 void
-_eglReleaseDisplayResources(_EGLDriver *drv, EGLDisplay dpy)
+_eglReleaseDisplayResources(_EGLDriver *drv, _EGLDisplay *display)
 {
-   _EGLDisplay *display;
-   _EGLContext *contexts;
-   _EGLSurface *surfaces;
-
-   display = _eglLookupDisplay(dpy);
-   if (!display)
-      return;
-   contexts = display->ContextList;
-   surfaces = display->SurfaceList;
-
-   while (contexts) {
-      EGLContext handle = _eglGetContextHandle(contexts);
-      contexts = contexts->Next;
-      drv->API.DestroyContext(drv, dpy, handle);
+   _EGLResource *list;
+
+   list = display->ResourceLists[_EGL_RESOURCE_CONTEXT];
+   while (list) {
+      _EGLContext *ctx = (_EGLContext *) list;
+      list = list->Next;
+
+      _eglUnlinkContext(ctx);
+      drv->API.DestroyContext(drv, display, ctx);
    }
-   assert(!display->ContextList);
+   assert(!display->ResourceLists[_EGL_RESOURCE_CONTEXT]);
 
-   while (surfaces) {
-      EGLSurface handle = _eglGetSurfaceHandle(surfaces);
-      surfaces = surfaces->Next;
-      drv->API.DestroySurface(drv, dpy, handle);
+   list = display->ResourceLists[_EGL_RESOURCE_SURFACE];
+   while (list) {
+      _EGLSurface *surf = (_EGLSurface *) list;
+      list = list->Next;
+
+      _eglUnlinkSurface(surf);
+      drv->API.DestroySurface(drv, display, surf);
    }
-   assert(!display->SurfaceList);
+   assert(!display->ResourceLists[_EGL_RESOURCE_SURFACE]);
 }
 
 
@@ -235,162 +179,136 @@ _eglReleaseDisplayResources(_EGLDriver *drv, EGLDisplay dpy)
 void
 _eglCleanupDisplay(_EGLDisplay *disp)
 {
-   EGLint i;
-
-   for (i = 0; i < disp->NumConfigs; i++) {
-      free(disp->Configs[i]);
+   if (disp->Configs) {
+      _eglDestroyArray(disp->Configs, free);
+      disp->Configs = NULL;
    }
-   free(disp->Configs);
-   disp->Configs = NULL;
 
    /* XXX incomplete */
-
-   free((void *) disp->DriverName);
-   disp->DriverName = NULL;
-
-   /* driver deletes the _EGLDisplay object */
 }
 
 
 /**
- * Link a context to a display and return the handle of the link.
- * The handle can be passed to client directly.
+ * Return EGL_TRUE if the given handle is a valid handle to a display.
  */
-EGLContext
-_eglLinkContext(_EGLContext *ctx, _EGLDisplay *dpy)
+EGLBoolean
+_eglCheckDisplayHandle(EGLDisplay dpy)
 {
-   ctx->Display = dpy;
-   ctx->Next = dpy->ContextList;
-   dpy->ContextList = ctx;
-   return (EGLContext) ctx;
+   _EGLDisplay *cur;
+
+   _eglLockMutex(_eglGlobal.Mutex);
+   cur = _eglGlobal.DisplayList;
+   while (cur) {
+      if (cur == (_EGLDisplay *) dpy)
+         break;
+      cur = cur->Next;
+   }
+   _eglUnlockMutex(_eglGlobal.Mutex);
+   return (cur != NULL);
 }
 
 
 /**
- * Unlink a linked context from its display.
- * Accessing an unlinked context should generate EGL_BAD_CONTEXT error.
+ * Return EGL_TRUE if the given resource is valid.  That is, the display does
+ * own the resource.
  */
-void
-_eglUnlinkContext(_EGLContext *ctx)
+EGLBoolean
+_eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy)
 {
-   _EGLContext *prev;
-
-   prev = ctx->Display->ContextList;
-   if (prev != ctx) {
-      while (prev) {
-         if (prev->Next == ctx)
-            break;
-         prev = prev->Next;
+   _EGLResource *list = dpy->ResourceLists[type];
+   
+   if (!res)
+      return EGL_FALSE;
+
+   while (list) {
+      if (res == (void *) list) {
+         assert(list->Display == dpy);
+         break;
       }
-      assert(prev);
-      prev->Next = ctx->Next;
-   }
-   else {
-      ctx->Display->ContextList = ctx->Next;
+      list = list->Next;
    }
 
-   ctx->Next = NULL;
-   ctx->Display = NULL;
+   return (list != NULL);
 }
 
 
 /**
- * Return the handle of a linked context, or EGL_NO_CONTEXT.
+ * Initialize a display resource.
  */
-EGLContext
-_eglGetContextHandle(_EGLContext *ctx)
+void
+_eglInitResource(_EGLResource *res, EGLint size, _EGLDisplay *dpy)
 {
-   return (EGLContext) ((ctx && ctx->Display) ? ctx : EGL_NO_CONTEXT);
+   memset(res, 0, size);
+   res->Display = dpy;
+   res->RefCount = 1;
 }
 
 
 /**
- * Lookup a handle to find the linked context.
- * Return NULL if the handle has no corresponding linked context.
+ * Increment reference count for the resource.
  */
-_EGLContext *
-_eglLookupContext(EGLContext ctx)
+void
+_eglGetResource(_EGLResource *res)
 {
-   _EGLContext *context = (_EGLContext *) ctx;
-   return (context && context->Display) ? context : NULL;
+   assert(res && res->RefCount > 0);
+   /* hopefully a resource is always manipulated with its display locked */
+   res->RefCount++;
 }
 
 
 /**
- * Link a surface to a display and return the handle of the link.
- * The handle can be passed to client directly.
+ * Decrement reference count for the resource.
  */
-EGLSurface
-_eglLinkSurface(_EGLSurface *surf, _EGLDisplay *dpy)
+EGLBoolean
+_eglPutResource(_EGLResource *res)
 {
-   EGLuint key;
+   assert(res && res->RefCount > 0);
+   res->RefCount--;
+   return (!res->RefCount);
+}
 
-   surf->Display = dpy;
-   surf->Next = dpy->SurfaceList;
-   dpy->SurfaceList = surf;
 
-   key = _eglHashGenKey(dpy->SurfaceHash);
-   assert(key);
-   _eglHashInsert(dpy->SurfaceHash, key, surf);
+/**
+ * Link a resource to its display.
+ */
+void
+_eglLinkResource(_EGLResource *res, _EGLResourceType type)
+{
+   assert(res->Display);
 
-   surf->Handle = (EGLSurface) _eglUIntToPointer(key);
-   return surf->Handle;
+   res->IsLinked = EGL_TRUE;
+   res->Next = res->Display->ResourceLists[type];
+   res->Display->ResourceLists[type] = res;
+   _eglGetResource(res);
 }
 
 
 /**
- * Unlink a linked surface from its display.
- * Accessing an unlinked surface should generate EGL_BAD_SURFACE error.
+ * Unlink a linked resource from its display.
  */
 void
-_eglUnlinkSurface(_EGLSurface *surf)
+_eglUnlinkResource(_EGLResource *res, _EGLResourceType type)
 {
-   _EGLSurface *prev;
-   EGLuint key = _eglPointerToUInt((void *) surf->Handle);
+   _EGLResource *prev;
 
-   _eglHashRemove(surf->Display->SurfaceHash, key);
-   surf->Handle = EGL_NO_SURFACE;
-
-   prev = surf->Display->SurfaceList;
-   if (prev != surf) {
+   prev = res->Display->ResourceLists[type];
+   if (prev != res) {
       while (prev) {
-         if (prev->Next == surf)
+         if (prev->Next == res)
             break;
          prev = prev->Next;
       }
       assert(prev);
-      prev->Next = surf->Next;
+      prev->Next = res->Next;
    }
    else {
-      prev = NULL;
-      surf->Display->SurfaceList = surf->Next;
+      res->Display->ResourceLists[type] = res->Next;
    }
 
-   surf->Next = NULL;
-   surf->Display = NULL;
-}
+   res->Next = NULL;
+   res->IsLinked = EGL_FALSE;
+   _eglPutResource(res);
 
-
-/**
- * Return the handle of a linked surface, or EGL_NO_SURFACE.
- */
-EGLSurface
-_eglGetSurfaceHandle(_EGLSurface *surface)
-{
-   if (surface)
-      return surface->Handle;
-   else
-      return EGL_NO_SURFACE;
-}
-
-
-/**
- * Lookup a handle to find the linked surface.
- * Return NULL if the handle has no corresponding linked surface.
- */
-_EGLSurface *
-_eglLookupSurface(EGLSurface surf)
-{
-   EGLuint key = _eglPointerToUInt((void *) surf);
-   return (_EGLSurface *) _eglHashLookup(_eglSurfaceHash, key);
+   /* We always unlink before destroy.  The driver still owns a reference */
+   assert(res->RefCount);
 }