Fix changed behaviour after QEglProperties::value() patch

Patch 27fadaa7eb2d58b47e7f0f508e3402e7a8de3894 (Make
QEglProperties::value() return the EGL default if not set) changed
behaviour. This patch reverts this change to behaviour but keeps
QEglProperties::value() returning the EGL default value.

2 files changed, 14 insertions, 14 deletions

diff --git a/src/opengl/qegl.cpp b/src/opengl/qegl.cpp
index aebc3cb..c6c258b 100644
--- a/src/opengl/qegl.cpp
+++ b/src/opengl/qegl.cpp
@@ -119,7 +119,7 @@ bool QEglContext::chooseConfig
             if (red == props.value(EGL_RED_SIZE) &&
                     green == props.value(EGL_GREEN_SIZE) &&
                     blue == props.value(EGL_BLUE_SIZE) &&
-                    (props.value(EGL_ALPHA_SIZE) == EGL_DONT_CARE ||
+                    (props.value(EGL_ALPHA_SIZE) == 0 ||
                      alpha == props.value(EGL_ALPHA_SIZE))) {
                 cfg = configs[index];
                 delete [] configs;
@@ -448,7 +448,7 @@ int QEglProperties::value(int name) const
     case EGL_NATIVE_VISUAL_ID:
     case EGL_NONE:
         qWarning("QEglProperties::value() - Attibute %d does not affect config selection", name);
-        return 0;
+        return EGL_DONT_CARE;
     default:
         qWarning("QEglProperties::value() - Attibute %d is unknown in EGL <=1.4", name);
         return EGL_DONT_CARE;
@@ -640,13 +640,13 @@ QString QEglProperties::toString() const
 #endif
 
     val = value(EGL_DEPTH_SIZE);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" depth="));
         str += QString::number(val);
     }
 
     val = value(EGL_STENCIL_SIZE);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" stencil="));
         str += QString::number(val);
     }
@@ -696,7 +696,7 @@ QString QEglProperties::toString() const
     }
 
     val = value(EGL_LEVEL);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" level="));
         str += QString::number(val);
     }
@@ -747,13 +747,13 @@ QString QEglProperties::toString() const
 #endif
 
     val = value(EGL_SAMPLES);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" samples="));
         str += QString::number(val);
     }
 
     val = value(EGL_SAMPLE_BUFFERS);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" sample-buffers="));
         str += QString::number(val);
     }
@@ -802,7 +802,7 @@ QString QEglProperties::toString() const
 
 #ifdef EGL_LUMINANCE_SIZE
     val = value(EGL_LUMINANCE_SIZE);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" luminance="));
         str += QString::number(val);
     }
@@ -810,7 +810,7 @@ QString QEglProperties::toString() const
 
 #ifdef EGL_ALPHA_MASK_SIZE
     val = value(EGL_ALPHA_MASK_SIZE);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         addTag(str, QLatin1String(" alpha-mask="));
         str += QString::number(val);
     }
@@ -818,7 +818,7 @@ QString QEglProperties::toString() const
 
 #ifdef EGL_CONFORMANT
     val = value(EGL_CONFORMANT);
-    if (val != EGL_DONT_CARE) {
+    if (val != 0) {
         if (val)
             addTag(str, QLatin1String(" conformant=true"));
         else
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index 98c5710..287c537 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -57,14 +57,14 @@ void qt_egl_set_format(QEglProperties& props, int deviceType, const QGLFormat& f
     // Set the pixel format to that contained in the QGLFormat
     // if the system hasn't already chosen a fixed format to
     // match the pixmap, widget, etc.
-    if (props.value(EGL_RED_SIZE) == EGL_DONT_CARE || f.redBufferSize() != -1)
+    if (props.value(EGL_RED_SIZE) == 0 || f.redBufferSize() != -1)
         props.setValue(EGL_RED_SIZE, f.redBufferSize() == -1 ? 1 : f.redBufferSize());
-    if (props.value(EGL_GREEN_SIZE) == EGL_DONT_CARE || f.greenBufferSize() != -1)
+    if (props.value(EGL_GREEN_SIZE) == 0 || f.greenBufferSize() != -1)
         props.setValue(EGL_GREEN_SIZE, f.greenBufferSize() == -1 ? 1 : f.greenBufferSize());
-    if (props.value(EGL_BLUE_SIZE) == EGL_DONT_CARE || f.blueBufferSize() != -1)
+    if (props.value(EGL_BLUE_SIZE) == 0 || f.blueBufferSize() != -1)
         props.setValue(EGL_BLUE_SIZE, f.blueBufferSize() == -1 ? 1 : f.blueBufferSize());
     if (f.alpha()) {
-        if (props.value(EGL_ALPHA_SIZE) == EGL_DONT_CARE || f.alphaBufferSize() != -1)
+        if (props.value(EGL_ALPHA_SIZE) == 0 || f.alphaBufferSize() != -1)
             props.setValue(EGL_ALPHA_SIZE, f.alphaBufferSize() == -1 ? 1 : f.alphaBufferSize());
     }