Allow the null backend to be used by dEQP.

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -52,6 +52,7 @@ const APIInfo g_eglDisplayAPIs[] = {
     {"angle-d3d11", gpu::GPUTestConfig::kAPID3D11},
     {"angle-gl", gpu::GPUTestConfig::kAPIGLDesktop},
     {"angle-gles", gpu::GPUTestConfig::kAPIGLES},
+    {"angle-null", gpu::GPUTestConfig::kAPIUnknown },
 };
 
 const APIInfo *g_initAPI = nullptr;

src/tests/deqp_support/tcuANGLEPlatform.cpp

@@ -36,6 +36,7 @@ ANGLEPlatform::ANGLEPlatform()
     angle::SetLowPriorityProcess();
 
 #if (DE_OS == DE_OS_WIN32)
+    {
         std::vector<eglw::EGLAttrib> d3d11Attribs;
         d3d11Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
         d3d11Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
@@ -46,7 +47,9 @@ ANGLEPlatform::ANGLEPlatform()
         auto *d3d11Factory = new ANGLENativeDisplayFactory(
             "angle-d3d11", "ANGLE D3D11 Display", d3d11Attribs, &mEvents);
         m_nativeDisplayFactoryRegistry.registerFactory(d3d11Factory);
+    }
 
+    {
         std::vector<eglw::EGLAttrib> d3d9Attribs;
         d3d9Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
         d3d9Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE);
@@ -57,7 +60,9 @@ ANGLEPlatform::ANGLEPlatform()
         auto *d3d9Factory = new ANGLENativeDisplayFactory(
             "angle-d3d9", "ANGLE D3D9 Display", d3d9Attribs, &mEvents);
         m_nativeDisplayFactoryRegistry.registerFactory(d3d9Factory);
+    }
 
+    {
         std::vector<eglw::EGLAttrib> d3d1193Attribs;
         d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
         d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
@@ -72,9 +77,11 @@ ANGLEPlatform::ANGLEPlatform()
         auto *d3d1193Factory = new ANGLENativeDisplayFactory(
             "angle-d3d11-fl93", "ANGLE D3D11 FL9_3 Display", d3d1193Attribs, &mEvents);
         m_nativeDisplayFactoryRegistry.registerFactory(d3d1193Factory);
+    }
 #endif // (DE_OS == DE_OS_WIN32)
 
 #if defined(ANGLE_USE_OZONE) || (DE_OS == DE_OS_ANDROID)
+    {
         std::vector<eglw::EGLAttrib> glesAttribs;
         glesAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
         glesAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
@@ -83,8 +90,10 @@ ANGLEPlatform::ANGLEPlatform()
         auto *glesFactory = new ANGLENativeDisplayFactory(
             "angle-gles", "ANGLE OpenGL ES Display", glesAttribs, &mEvents);
         m_nativeDisplayFactoryRegistry.registerFactory(glesFactory);
+    }
 #endif
 
+    {
         std::vector<eglw::EGLAttrib> glAttribs;
         glAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
         glAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
@@ -93,6 +102,18 @@ ANGLEPlatform::ANGLEPlatform()
         auto *glFactory = new ANGLENativeDisplayFactory(
             "angle-gl", "ANGLE OpenGL Display", glAttribs, &mEvents);
         m_nativeDisplayFactoryRegistry.registerFactory(glFactory);
+    }
+
+    {
+        std::vector<eglw::EGLAttrib> nullAttribs;
+        nullAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
+        nullAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE);
+        nullAttribs.push_back(EGL_NONE);
+
+        auto *nullFactory = new ANGLENativeDisplayFactory(
+            "angle-null", "ANGLE NULL Display", nullAttribs, &mEvents);
+        m_nativeDisplayFactoryRegistry.registerFactory(nullFactory);
+    }
 
     m_contextFactoryRegistry.registerFactory(new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));