andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefer KHR_surfaceless_context EGL extension over KHR_surfaceless_opengl/gles2.

Browse Source 
Current Mesa Git only advertises the former instead of the latter.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Michel Dänzer 2012-08-07 18:16:58 +02:00 committed by Eric Anholt
parent 59653fa08a
commit 7eb434918b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glamor/glamor_egl.c
View File

@ -397,7 +397,7 @@ glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL)
static Bool static Bool
glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl, glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
char *extension) const char *extension)
{ {
const char *egl_extensions; const char *egl_extensions;
char *pext; char *pext;
@ -512,12 +512,19 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
return FALSE; \ return FALSE; \
} }
#define GLAMOR_CHECK_EGL_EXTENSIONS(EXT1, EXT2) \
if (!glamor_egl_has_extension(glamor_egl, "EGL_" #EXT1) && \
!glamor_egl_has_extension(glamor_egl, "EGL_" #EXT2)) { \
ErrorF("EGL_" #EXT1 " or EGL_" #EXT2 " required.\n"); \
return FALSE; \
}
GLAMOR_CHECK_EGL_EXTENSION(MESA_drm_image); GLAMOR_CHECK_EGL_EXTENSION(MESA_drm_image);
GLAMOR_CHECK_EGL_EXTENSION(KHR_gl_renderbuffer_image); GLAMOR_CHECK_EGL_EXTENSION(KHR_gl_renderbuffer_image);
#ifdef GLAMOR_GLES2 #ifdef GLAMOR_GLES2
GLAMOR_CHECK_EGL_EXTENSION(KHR_surfaceless_gles2); GLAMOR_CHECK_EGL_EXTENSIONS(KHR_surfaceless_context, KHR_surfaceless_gles2);
#else #else
GLAMOR_CHECK_EGL_EXTENSION(KHR_surfaceless_opengl); GLAMOR_CHECK_EGL_EXTENSIONS(KHR_surfaceless_context, KHR_surfaceless_opengl);
#endif #endif
glamor_egl->egl_create_image_khr = (PFNEGLCREATEIMAGEKHRPROC) glamor_egl->egl_create_image_khr = (PFNEGLCREATEIMAGEKHRPROC)