projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl/dri2: dri2_initialize: Do not reference-count TestOnly display
[mesa.git]
/
src
/
egl
/
drivers
/
dri2
/
egl_dri2.c
diff --git
a/src/egl/drivers/dri2/egl_dri2.c
b/src/egl/drivers/dri2/egl_dri2.c
index ac5ecbbf3fd8f3e938a4fe12303a196030478074..e854903a6f1b3a7c928f68f28455c2f7ce1d70d6 100644
(file)
--- a/
src/egl/drivers/dri2/egl_dri2.c
+++ b/
src/egl/drivers/dri2/egl_dri2.c
@@
-788,45
+788,34
@@
dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp)
if (disp->Options.UseFallback)
return EGL_FALSE;
if (disp->Options.UseFallback)
return EGL_FALSE;
+ /* Nothing to initialize for a test only display */
+ if (disp->Options.TestOnly)
+ return EGL_TRUE;
+
switch (disp->Platform) {
#ifdef HAVE_SURFACELESS_PLATFORM
case _EGL_PLATFORM_SURFACELESS:
switch (disp->Platform) {
#ifdef HAVE_SURFACELESS_PLATFORM
case _EGL_PLATFORM_SURFACELESS:
- if (disp->Options.TestOnly)
- ret = EGL_TRUE;
- else
- ret = dri2_initialize_surfaceless(drv, disp);
+ ret = dri2_initialize_surfaceless(drv, disp);
break;
#endif
#ifdef HAVE_X11_PLATFORM
case _EGL_PLATFORM_X11:
break;
#endif
#ifdef HAVE_X11_PLATFORM
case _EGL_PLATFORM_X11:
- if (disp->Options.TestOnly)
- ret = EGL_TRUE;
- else
- ret = dri2_initialize_x11(drv, disp);
+ ret = dri2_initialize_x11(drv, disp);
break;
#endif
#ifdef HAVE_DRM_PLATFORM
case _EGL_PLATFORM_DRM:
break;
#endif
#ifdef HAVE_DRM_PLATFORM
case _EGL_PLATFORM_DRM:
- if (disp->Options.TestOnly)
- ret = EGL_TRUE;
- else
- ret = dri2_initialize_drm(drv, disp);
+ ret = dri2_initialize_drm(drv, disp);
break;
#endif
#ifdef HAVE_WAYLAND_PLATFORM
case _EGL_PLATFORM_WAYLAND:
break;
#endif
#ifdef HAVE_WAYLAND_PLATFORM
case _EGL_PLATFORM_WAYLAND:
- if (disp->Options.TestOnly)
- ret = EGL_TRUE;
- else
- ret = dri2_initialize_wayland(drv, disp);
+ ret = dri2_initialize_wayland(drv, disp);
break;
#endif
#ifdef HAVE_ANDROID_PLATFORM
case _EGL_PLATFORM_ANDROID:
break;
#endif
#ifdef HAVE_ANDROID_PLATFORM
case _EGL_PLATFORM_ANDROID:
- if (disp->Options.TestOnly)
- ret = EGL_TRUE;
- else
- ret = dri2_initialize_android(drv, disp);
+ ret = dri2_initialize_android(drv, disp);
break;
#endif
default:
break;
#endif
default: