Mesa (master): egl: Allow OpenGL ES 3.0 as a version
Ian Romanick
idr at kemper.freedesktop.org
Tue Aug 14 22:49:28 UTC 2012
Module: Mesa
Branch: master
Commit: dbecb413008c19e1864de93d9a8a9123bfee46e7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbecb413008c19e1864de93d9a8a9123bfee46e7
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Jul 19 16:12:13 2012 -0700
egl: Allow OpenGL ES 3.0 as a version
In the DRI2 back-end this will get the same API as GLES 2.0.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/egl/drivers/dri2/egl_dri2.c | 1 +
src/egl/main/eglcontext.c | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index c3068c3..423d18d 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -674,6 +674,7 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
api = __DRI_API_GLES;
break;
case 2:
+ case 3:
api = __DRI_API_GLES2;
break;
default:
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index cb50de7..829050d 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -54,6 +54,7 @@ _eglGetContextAPIBit(_EGLContext *ctx)
bit = EGL_OPENGL_ES_BIT;
break;
case 2:
+ case 3:
bit = EGL_OPENGL_ES2_BIT;
break;
default:
@@ -317,9 +318,14 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *dpy,
break;
case 2:
+ if (ctx->ClientMinorVersion > 0)
+ err = EGL_BAD_MATCH;
+ break;
+
+ case 3:
default:
/* Don't put additional version checks here. We don't know that
- * there won't be versions > 2.0.
+ * there won't be versions > 3.0.
*/
break;
}
More information about the mesa-commit
mailing list