diff options
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 11 | ||||
| -rw-r--r-- | src/egl/main/eglconfig.c | 1 | ||||
| -rw-r--r-- | src/egl/main/eglcontext.c | 4 | ||||
| -rw-r--r-- | src/egl/main/eglcurrent.h | 1 | ||||
| -rw-r--r-- | src/egl/main/eglmisc.c | 3 | ||||
| -rw-r--r-- | src/egl/main/eglsurface.c | 5 |
6 files changed, 21 insertions, 4 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 1f13d79c696..09659597044 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -465,7 +465,10 @@ dri2_setup_screen(_EGLDisplay *disp) api_mask = dri2_dpy->dri2->getAPIMask(dri2_dpy->dri_screen); } else { assert(dri2_dpy->swrast); - api_mask = 1 << __DRI_API_OPENGL | 1 << __DRI_API_GLES | 1 << __DRI_API_GLES2; + api_mask = 1 << __DRI_API_OPENGL | + 1 << __DRI_API_GLES | + 1 << __DRI_API_GLES2 | + 1 << __DRI_API_GLES3; } disp->ClientAPIs = 0; @@ -475,6 +478,8 @@ dri2_setup_screen(_EGLDisplay *disp) disp->ClientAPIs |= EGL_OPENGL_ES_BIT; if (api_mask & (1 << __DRI_API_GLES2)) disp->ClientAPIs |= EGL_OPENGL_ES2_BIT; + if (api_mask & (1 << __DRI_API_GLES3)) + disp->ClientAPIs |= EGL_OPENGL_ES3_BIT_KHR; assert(dri2_dpy->dri2 || dri2_dpy->swrast); disp->Extensions.KHR_surfaceless_context = EGL_TRUE; @@ -737,8 +742,10 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, api = __DRI_API_GLES; break; case 2: + api = __DRI_API_GLES3; + break; case 3: - api = __DRI_API_GLES2; + api = __DRI_API_GLES3; break; default: _eglError(EGL_BAD_PARAMETER, "eglCreateContext"); diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index e1d53da3cd5..b18f30123a9 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -331,6 +331,7 @@ _eglValidateConfig(const _EGLConfig *conf, EGLBoolean for_matching) mask = EGL_OPENGL_ES_BIT | EGL_OPENVG_BIT | EGL_OPENGL_ES2_BIT | + EGL_OPENGL_ES3_BIT_KHR | EGL_OPENGL_BIT; break; default: diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index 4efb76bb986..86af91d7deb 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -54,9 +54,11 @@ _eglGetContextAPIBit(_EGLContext *ctx) bit = EGL_OPENGL_ES_BIT; break; case 2: - case 3: bit = EGL_OPENGL_ES2_BIT; break; + case 3: + bit = EGL_OPENGL_ES3_BIT_KHR; + break; default: break; } diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h index a64821eb125..45fcc64aad4 100644 --- a/src/egl/main/eglcurrent.h +++ b/src/egl/main/eglcurrent.h @@ -37,6 +37,7 @@ (EGL_OPENGL_ES_BIT | \ EGL_OPENVG_BIT | \ EGL_OPENGL_ES2_BIT | \ + EGL_OPENGL_ES3_BIT_KHR | \ EGL_OPENGL_BIT) diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c index d445c41810c..92b0eae5f2a 100644 --- a/src/egl/main/eglmisc.c +++ b/src/egl/main/eglmisc.c @@ -140,6 +140,9 @@ _eglUpdateAPIsString(_EGLDisplay *dpy) if (dpy->ClientAPIs & EGL_OPENGL_ES2_BIT) strcat(apis, "OpenGL_ES2 "); + if (dpy->ClientAPIs & EGL_OPENGL_ES3_BIT_KHR) + strcat(apis, "OpenGL_ES3 "); + if (dpy->ClientAPIs & EGL_OPENVG_BIT) strcat(apis, "OpenVG "); diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c index 9fc53674fd0..fa57f833683 100644 --- a/src/egl/main/eglsurface.c +++ b/src/egl/main/eglsurface.c @@ -435,11 +435,14 @@ _eglSurfaceAttrib(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surface, { EGLint confval; EGLint err = EGL_SUCCESS; + EGLint all_es_bits = EGL_OPENGL_ES_BIT | + EGL_OPENGL_ES2_BIT | + EGL_OPENGL_ES3_BIT_KHR; switch (attribute) { case EGL_MIPMAP_LEVEL: confval = surface->Config->RenderableType; - if (!(confval & (EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT))) { + if (!(confval & all_es_bits)) { err = EGL_BAD_PARAMETER; break; } |