diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2012-09-10 10:43:18 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> | 2012-09-10 10:43:18 -0300 |
| commit | 2266dcb9a37d8ffdd683bdd2403e7f2a405a0ff0 (patch) | |
| tree | c1819e6336e624b573fae80578c723bf431bd8e3 | |
| parent | 65da25919c3151b3c7b5543c636295711e17a11c (diff) | |
Move ext reporting to gst_vidroidsink_init_egl_exts()
| -rw-r--r-- | sys/android/gstvidroidsink.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sys/android/gstvidroidsink.c b/sys/android/gstvidroidsink.c index ff0e4e736..0c77f0c58 100644 --- a/sys/android/gstvidroidsink.c +++ b/sys/android/gstvidroidsink.c @@ -852,18 +852,21 @@ gst_vidroidsink_expose (GstXOverlay * overlay) static void gst_vidroidsink_init_egl_exts (GstViDroidSink * vidroidsink) { -#ifdef EGL_FAST_RENDERING_POSSIBLE const char *eglexts; unsigned const char *glexts; + eglexts = eglQueryString (vidroidsink->display, EGL_EXTENSIONS); + glexts = glGetString (GL_EXTENSIONS); + + GST_DEBUG_OBJECT (vidroidsink, "Available EGL extensions: %s\n", eglexts); + GST_DEBUG_OBJECT (vidroidsink, "Available GLES extensions: %s\n", glexts); + +#ifdef EGL_FAST_RENDERING_POSSIBLE /* OK Fast rendering should be possible from the declared - * extensions on the header + * extensions on the eglexts/glexts.h headers */ - /* Check for claimed support from reported EGL/GLES extensions */ - - eglexts = eglQueryString (vidroidsink->display, EGL_EXTENSIONS); - glexts = glGetString (GL_EXTENSIONS); + /* Check for support from claimed EGL/GLES extensions */ if (!strstr (eglexts, "EGL_KHR_image")) goto KHR_IMAGE_NA; @@ -872,7 +875,7 @@ gst_vidroidsink_init_egl_exts (GstViDroidSink * vidroidsink) if (!strstr (glexts, "GL_OES_EGL_image")) goto TEXTURE_2DOES_NA; - /* Check for actual proc addresses */ + /* Check for actual extension proc addresses */ my_eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC) eglGetProcAddress ("eglCreateImageKHR"); @@ -1068,10 +1071,8 @@ gst_vidroidsink_init_egl_display (GstViDroidSink * vidroidsink) goto HANDLE_ERROR; } - GST_INFO_OBJECT (vidroidsink, "System reports EGL version v%d.%d", + GST_INFO_OBJECT (vidroidsink, "System reports supported EGL version v%d.%d", egl_major, egl_minor); - GST_DEBUG_OBJECT (vidroidsink, "Available EGL extensions: %s", - eglQueryString (vidroidsink->display, EGL_EXTENSIONS)); if (!eglChooseConfig (vidroidsink->display, vidroidsink_RGB16_config, &vidroidsink->config, 1, &egl_configs)) { |