2 files changed, 19 insertions, 6 deletions
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
index da41cfeabf..020d035bf7 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
@@ -100,18 +100,24 @@ QVector<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format)
     configAttributes.append(EGL_ALPHA_SIZE);
     configAttributes.append(alphaSize > 0 ? alphaSize : 0);
 
-    configAttributes.append(EGL_DEPTH_SIZE);
-    configAttributes.append(depthSize > 0 ? depthSize : 0);
-
-    configAttributes.append(EGL_STENCIL_SIZE);
-    configAttributes.append(stencilSize > 0 ? stencilSize : 0);
-
     configAttributes.append(EGL_SAMPLES);
     configAttributes.append(sampleCount > 0 ? sampleCount : 0);
 
     configAttributes.append(EGL_SAMPLE_BUFFERS);
     configAttributes.append(sampleCount > 0);
 
+    if (format.renderableType() != QSurfaceFormat::OpenVG) {
+        configAttributes.append(EGL_DEPTH_SIZE);
+        configAttributes.append(depthSize > 0 ? depthSize : 0);
+
+        configAttributes.append(EGL_STENCIL_SIZE);
+        configAttributes.append(stencilSize > 0 ? stencilSize : 0);
+    } else {
+        // OpenVG needs alpha mask for clipping
+        configAttributes.append(EGL_ALPHA_MASK_SIZE);
+        configAttributes.append(8);
+    }
+
     return configAttributes;
 }
 
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index 6a3bc25418..2d3d91b4fa 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -167,6 +167,13 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
                                 : EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR);
         }
     }
+
+    // Special Options for OpenVG surfaces
+    if (m_format.renderableType() == QSurfaceFormat::OpenVG) {
+        contextAttrs.append(EGL_ALPHA_MASK_SIZE);
+        contextAttrs.append(8);
+    }
+
     contextAttrs.append(EGL_NONE);
     m_contextAttrs = contextAttrs;