KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl: Rename ClientVersion to ClientMajorVersion, add ClientMinorVersion 

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2012-07-18 15:59:15 -07:00
parent ce55741cbc
commit 3fd79dd988
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/egl/drivers/dri2/egl_dri2.c
View File

@ -654,7 +654,7 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
switch (dri2_ctx->base.ClientAPI) { switch (dri2_ctx->base.ClientAPI) {
case EGL_OPENGL_ES_API: case EGL_OPENGL_ES_API:
switch (dri2_ctx->base.ClientVersion) { switch (dri2_ctx->base.ClientMajorVersion) {
case 1: case 1:
api = __DRI_API_GLES; api = __DRI_API_GLES;
break; break;
@ -701,7 +701,7 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
unsigned error; unsigned error;
const uint32_t ctx_attribs[2] = { const uint32_t ctx_attribs[2] = {
__DRI_CTX_ATTRIB_MAJOR_VERSION, __DRI_CTX_ATTRIB_MAJOR_VERSION,
dri2_ctx->base.ClientVersion dri2_ctx->base.ClientMajorVersion
}; };
dri2_ctx->dri_context = dri2_ctx->dri_context =

9
src/egl/main/eglcontext.c
View File

@ -49,7 +49,7 @@ _eglGetContextAPIBit(_EGLContext *ctx)
switch (ctx->ClientAPI) { switch (ctx->ClientAPI) {
case EGL_OPENGL_ES_API: case EGL_OPENGL_ES_API:
switch (ctx->ClientVersion) { switch (ctx->ClientMajorVersion) {
case 1: case 1:
bit = EGL_OPENGL_ES_BIT; bit = EGL_OPENGL_ES_BIT;
break; break;
@ -100,7 +100,7 @@ _eglParseContextAttribList(_EGLContext *ctx, const EGLint *attrib_list)
err = EGL_BAD_ATTRIBUTE; err = EGL_BAD_ATTRIBUTE;
break; break;
} }
ctx->ClientVersion = val; ctx->ClientMajorVersion = val;
break; break;
default: default:
err = EGL_BAD_ATTRIBUTE; err = EGL_BAD_ATTRIBUTE;
@ -138,7 +138,8 @@ _eglInitContext(_EGLContext *ctx, _EGLDisplay *dpy, _EGLConfig *conf,
ctx->Config = conf; ctx->Config = conf;
ctx->WindowRenderBuffer = EGL_NONE; ctx->WindowRenderBuffer = EGL_NONE;
ctx->ClientVersion = 1; /* the default, per EGL spec */ ctx->ClientMajorVersion = 1; /* the default, per EGL spec */
ctx->ClientMinorVersion = 0;
err = _eglParseContextAttribList(ctx, attrib_list); err = _eglParseContextAttribList(ctx, attrib_list);
if (err == EGL_SUCCESS && ctx->Config) { if (err == EGL_SUCCESS && ctx->Config) {
@ -191,7 +192,7 @@ _eglQueryContext(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *c,
*value = c->Config->ConfigID; *value = c->Config->ConfigID;
break; break;
case EGL_CONTEXT_CLIENT_VERSION: case EGL_CONTEXT_CLIENT_VERSION:
*value = c->ClientVersion; *value = c->ClientMajorVersion;
break; break;
case EGL_CONTEXT_CLIENT_TYPE: case EGL_CONTEXT_CLIENT_TYPE:
*value = c->ClientAPI; *value = c->ClientAPI;

3
src/egl/main/eglcontext.h
View File

@ -52,7 +52,8 @@ struct _egl_context
_EGLConfig *Config; _EGLConfig *Config;
EGLint ClientAPI; /**< EGL_OPENGL_ES_API, EGL_OPENGL_API, EGL_OPENVG_API */ EGLint ClientAPI; /**< EGL_OPENGL_ES_API, EGL_OPENGL_API, EGL_OPENVG_API */
EGLint ClientVersion; /**< 1 = OpenGLES 1.x, 2 = OpenGLES 2.x */ EGLint ClientMajorVersion;
EGLint ClientMinorVersion;
/* The real render buffer when a window surface is bound */ /* The real render buffer when a window surface is bound */
EGLint WindowRenderBuffer; EGLint WindowRenderBuffer;