egl: combine VersionMajor and VersionMinor into one variable

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
This commit is contained in:
Marek Olšák
2015-05-12 16:40:29 +02:00
parent efda9c5649
commit 0e4b564ef2
2 changed files with 5 additions and 7 deletions

View File

@@ -410,8 +410,7 @@ _eglCreateAPIsString(_EGLDisplay *dpy)
static void
_eglComputeVersion(_EGLDisplay *disp)
{
disp->VersionMajor = 1;
disp->VersionMinor = 4;
disp->Version = 14;
}
/**
@@ -454,14 +453,14 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
_eglCreateExtensionsString(disp);
_eglCreateAPIsString(disp);
_eglsnprintf(disp->VersionString, sizeof(disp->VersionString),
"%d.%d (%s)", disp->VersionMajor, disp->VersionMinor,
"%d.%d (%s)", disp->Version / 10, disp->Version % 10,
disp->Driver->Name);
}
/* Update applications version of major and minor if not NULL */
if ((major != NULL) && (minor != NULL)) {
*major = disp->VersionMajor;
*minor = disp->VersionMinor;
*major = disp->Version / 10;
*minor = disp->Version % 10;
}
RETURN_EGL_SUCCESS(disp, EGL_TRUE);

View File

@@ -153,8 +153,7 @@ struct _egl_display
/* these fields are set by the driver during init */
void *DriverData; /**< Driver private data */
EGLint VersionMajor; /**< EGL major version */
EGLint VersionMinor; /**< EGL minor version */
EGLint Version; /**< EGL version major*10+minor */
EGLint ClientAPIs; /**< Bitmask of APIs supported (EGL_xxx_BIT) */
_EGLExtensions Extensions; /**< Extensions supported */