Mesa (gles3): egl: Allow OpenGL ES 3.0 as a version
Paul Berry
stereotype441 at kemper.freedesktop.org
Wed Aug 8 23:42:12 UTC 2012
Module: Mesa
Branch: gles3
Commit: dcb7fe6fb2bc11fa6193060517b263d09ab38cc3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcb7fe6fb2bc11fa6193060517b263d09ab38cc3
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>
---
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 29aceff..11e12d5 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