diff options
author | Chia-I Wu <olv@lunarg.com> | 2011-01-13 16:53:13 +0800 |
---|---|---|
committer | Chia-I Wu <olv@lunarg.com> | 2011-01-13 17:57:38 +0800 |
commit | a4a38dcf61f141297a083ccac217200947d57b0d (patch) | |
tree | 54a4e03c9b0863fb98563e5e9824dc470a1708e2 /src/egl/main/eglapi.c | |
parent | 47b2af2c62fec3ac0fb501a31e93fc8d00c18cb8 (diff) |
egl: Cleanup _EGLDisplay initialization.
Reorder/rename and document the fields that should be set by the driver during
initialization. Drop the major/minor arguments from drv->API.Initialize.
Diffstat (limited to 'src/egl/main/eglapi.c')
-rw-r--r-- | src/egl/main/eglapi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index efa9e97346b..4e64ce6f718 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -57,7 +57,6 @@ #include <stdlib.h> #include <string.h> -#include "eglstring.h" #include "eglcontext.h" #include "egldisplay.h" #include "egltypedefs.h" @@ -294,16 +293,14 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) if (!_eglMatchDriver(disp, EGL_FALSE)) RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE); - _eglsnprintf(disp->Version, sizeof(disp->Version), "%d.%d (%s)", - disp->APImajor, disp->APIminor, disp->Driver->Name); /* limit to APIs supported by core */ - disp->ClientAPIsMask &= _EGL_API_ALL_BITS; + disp->ClientAPIs &= _EGL_API_ALL_BITS; } /* Update applications version of major and minor if not NULL */ if ((major != NULL) && (minor != NULL)) { - *major = disp->APImajor; - *minor = disp->APIminor; + *major = disp->VersionMajor; + *minor = disp->VersionMinor; } RETURN_EGL_SUCCESS(disp, EGL_TRUE); |