Demos (master): eglinfo: Factor out a "probe one display" function
Adam Jackson
ajax at kemper.freedesktop.org
Wed Apr 20 20:49:19 UTC 2016
Module: Demos
Branch: master
Commit: f091f8a2c98a87f9681e802c72ba692b927eb9e7
URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=f091f8a2c98a87f9681e802c72ba692b927eb9e7
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Apr 19 16:15:10 2016 -0400
eglinfo: Factor out a "probe one display" function
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
src/egl/opengl/eglinfo.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/egl/opengl/eglinfo.c b/src/egl/opengl/eglinfo.c
index b044eaa..875e407 100644
--- a/src/egl/opengl/eglinfo.c
+++ b/src/egl/opengl/eglinfo.c
@@ -155,19 +155,15 @@ PrintExtensions(EGLDisplay d)
printf("\n");
}
-int
-main(int argc, char *argv[])
+static int
+doOneDisplay(EGLDisplay d, const char *name)
{
int maj, min;
- EGLDisplay d;
-
- PrintExtensions(EGL_NO_DISPLAY);
-
- d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ printf("%s:\n", name);
if (!eglInitialize(d, &maj, &min)) {
printf("eglinfo: eglInitialize failed\n");
- exit(1);
+ return 1;
}
printf("EGL API version: %d.%d\n", maj, min);
@@ -180,8 +176,19 @@ main(int argc, char *argv[])
PrintExtensions(d);
PrintConfigs(d);
+ printf("\n");
+ return 0;
+}
- eglTerminate(d);
+int
+main(int argc, char *argv[])
+{
+ int ret;
- return 0;
+ PrintExtensions(EGL_NO_DISPLAY);
+ printf("\n");
+
+ ret = doOneDisplay(eglGetDisplay(EGL_DEFAULT_DISPLAY), "Default display");
+
+ return ret;
}
More information about the mesa-commit
mailing list