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>

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 9a17f8d31f281d54c4087fd6cda35591e667237c..81be6f9943b1bcb3e801a3d97f33e5fbd0e4b429 100644 (file)
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -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);

diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index bb394ec2962c3bf2a75d97cf904a3fac77954d3e..bc8cc7d63195f2466e74aa6b760b18a8a2743fea 100644 (file)
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -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 */