Roll dEQP (May 2019)

DEPS

@@ -9,7 +9,7 @@ vars = {
   'build_with_chromium': False,
 
   # Current revision of dEQP.
-  'deqp_revision': '66a49e0a43f7af654ee1de8a3b1bcaf6c0d14aa4',
+  'deqp_revision': '39894bc13c69b22c4aea018979b7daabc8dfc602',
 
   # Current revision of glslang, the Khronos SPIRV compiler.
   'glslang_revision': '6e384fef6c0fcd99395502217737be87b37e2218',

src/tests/BUILD.gn

@@ -570,6 +570,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
         "/EHsc",  # dEQP requires exceptions
         "/wd4091",  # typedef ignored when no variable is declared
         "/wd4100",
+        "/wd4101",  # unreferenced local variable
         "/wd4125",  # decimal digit terminates octal escape sequence
         "/wd4127",  # conditional expression constant
         "/wd4244",  # possible loss of data

src/tests/deqp.gni

@@ -42,6 +42,7 @@ deqp_include_dirs = [
   "$_deqp_path/modules/glshared",
   "$_deqp_path/modules/glusecases",
 ]
+
 deqp_gles2_sources = [
   "$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.cpp",
   "$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.hpp",
@@ -255,6 +256,7 @@ deqp_gles2_sources = [
   "$_deqp_path/modules/gles2/tes2TestPackage.hpp",
   "$_deqp_path/modules/gles2/tes2TestPackageEntry.cpp",
 ]
+
 deqp_gles3_sources = [
   "$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.cpp",
   "$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.hpp",
@@ -538,6 +540,7 @@ deqp_gles3_sources = [
   "$_deqp_path/modules/gles3/tes3TestPackage.hpp",
   "$_deqp_path/modules/gles3/tes3TestPackageEntry.cpp",
 ]
+
 deqp_gles31_sources = [
   "$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.cpp",
   "$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.hpp",
@@ -749,6 +752,7 @@ deqp_gles31_sources = [
   "$_deqp_path/modules/gles31/tes31TestPackage.hpp",
   "$_deqp_path/modules/gles31/tes31TestPackageEntry.cpp",
 ]
+
 deqp_egl_sources = [
   "$_deqp_path/modules/egl/teglAndroidUtil.cpp",
   "$_deqp_path/modules/egl/teglAndroidUtil.hpp",
@@ -854,6 +858,7 @@ deqp_egl_sources = [
   "$_deqp_path/modules/egl/teglWideColorTests.cpp",
   "$_deqp_path/modules/egl/teglWideColorTests.hpp",
 ]
+
 deqp_libtester_decpp_sources = [
   "$_deqp_path/framework/delibs/decpp/deArrayBuffer.cpp",
   "$_deqp_path/framework/delibs/decpp/deBlockBuffer.cpp",
@@ -880,6 +885,7 @@ deqp_libtester_decpp_sources = [
   "$_deqp_path/framework/delibs/decpp/deThreadSafeRingBuffer.cpp",
   "$_deqp_path/framework/delibs/decpp/deUniquePtr.cpp",
 ]
+
 deqp_libtester_sources = [
   "$_deqp_path/execserver/xsDefs.cpp",
   "$_deqp_path/execserver/xsExecutionServer.cpp",
@@ -989,21 +995,14 @@ deqp_libtester_sources = [
   "$_deqp_path/framework/egl/egluGLContextFactory.cpp",
   "$_deqp_path/framework/egl/egluGLFunctionLoader.cpp",
   "$_deqp_path/framework/egl/egluGLUtil.cpp",
-
-  # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
-  #"$_deqp_path/framework/egl/egluNativeDisplay.cpp",
-  "deqp_support/egluNativeDisplay_override.cpp",
-  "deqp_support/egluNativeDisplay_override.hpp",
+  "$_deqp_path/framework/egl/egluNativeDisplay.cpp",
   "$_deqp_path/framework/egl/egluNativePixmap.cpp",
   "$_deqp_path/framework/egl/egluNativeWindow.cpp",
   "$_deqp_path/framework/egl/egluPlatform.cpp",
   "$_deqp_path/framework/egl/egluStaticESLibrary.cpp",
   "$_deqp_path/framework/egl/egluStrUtil.cpp",
   "$_deqp_path/framework/egl/egluUnique.cpp",
-
-  # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
-  #"$_deqp_path/framework/egl/egluUtil.cpp",
-  "deqp_support/egluUtil_override.cpp",
+  "$_deqp_path/framework/egl/egluUtil.cpp",
   "$_deqp_path/framework/egl/wrapper/eglwDefs.cpp",
   "$_deqp_path/framework/egl/wrapper/eglwFunctions.cpp",
   "$_deqp_path/framework/egl/wrapper/eglwLibrary.cpp",
@@ -1126,12 +1125,14 @@ deqp_libtester_sources = [
   "deqp_support/tcuRandomOrderExecutor.cpp",
   "deqp_support/tcuRandomOrderExecutor.h",
 ]
+
 deqp_libtester_sources_win = [
   "$_deqp_path/framework/delibs/dethread/win32/deMutexWin32.c",
   "$_deqp_path/framework/delibs/dethread/win32/deSemaphoreWin32.c",
   "$_deqp_path/framework/delibs/dethread/win32/deThreadLocalWin32.c",
   "$_deqp_path/framework/delibs/dethread/win32/deThreadWin32.c",
 ]
+
 deqp_libtester_sources_unix = [
   "$_deqp_path/framework/delibs/dethread/unix/deMutexUnix.c",
   "$_deqp_path/framework/delibs/dethread/unix/deNamedSemaphoreUnix.c",
@@ -1139,6 +1140,7 @@ deqp_libtester_sources_unix = [
   "$_deqp_path/framework/delibs/dethread/unix/deThreadLocalUnix.c",
   "$_deqp_path/framework/delibs/dethread/unix/deThreadUnix.c",
 ]
+
 deqp_libtester_sources_android = [
   "$_deqp_path/framework/platform/android/tcuAndroidInternals.cpp",
   "$_deqp_path/framework/platform/android/tcuAndroidInternals.hpp",

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -51,6 +51,8 @@
 1442 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.vertex_fragment.struct.* = SKIP
 1442 : dEQP-GLES31.functional.image_load_store.* = SKIP
 
+// Times out shader compilation because it uses so many resources.
+3445 : dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48 = SKIP
 
 // D3D11 Failing Tests
 // Below cases are failed due to binding multi-UAVs to a single buffer is not supported in D3D backend.
@@ -524,6 +526,11 @@
 2826 D3D11 : dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.* = FAIL
 2826 D3D11 : dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.* = FAIL
 
+// Failing with dEQP roll
+3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.22 = FAIL
+3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.41 = FAIL
+3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.45 = SKIP
+
 // OPENGL Failing Tests
 1665 WIN NVIDIA OPENGL : dEQP-GLES31.functional.draw_indirect.negative.command_offset_not_in_buffer_unsigned32_wrap = FAIL
 1442 NVIDIA OPENGL : dEQP-GLES31.functional.fbo.no_attachments.maximums.all = FAIL

src/tests/deqp_support/egluNativeDisplay_override.cpp

-/*-------------------------------------------------------------------------
- * drawElements Quality Program Tester Core
- * ----------------------------------------
- *
- * Copyright 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */ /*!
- * \file
- * \brief EGL native display abstraction
- */ /*--------------------------------------------------------------------*/
-
-#include "egluNativeDisplay_override.hpp"
-#include "eglwEnums.hpp"
-
-namespace eglu
-{
-
-using namespace eglw;
-
-// NativeDisplay
-
-NativeDisplay::NativeDisplay(Capability capabilities,
-                             EGLenum platformType,
-                             const char *platformExtension)
-    : m_capabilities(capabilities),
-      m_platformType(platformType),
-      m_platformExtension(platformExtension)
-{
-    DE_ASSERT(platformType != EGL_NONE && platformExtension);
-    DE_ASSERT(capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT);
-}
-
-NativeDisplay::NativeDisplay(Capability capabilities)
-    : m_capabilities(capabilities), m_platformType(EGL_NONE), m_platformExtension("")
-{
-    DE_ASSERT(!(capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT));
-    DE_ASSERT(capabilities & CAPABILITY_GET_DISPLAY_LEGACY);
-}
-
-NativeDisplay::~NativeDisplay(void) {}
-
-EGLNativeDisplayType NativeDisplay::getLegacyNative(void)
-{
-    // If NativeDisplay claims to support CAPABILITY_GET_DISPLAY_LEGACY then
-    // this method must be implemented.
-    TCU_CHECK_INTERNAL((m_capabilities & CAPABILITY_GET_DISPLAY_LEGACY) == 0);
-    TCU_THROW(NotSupportedError, "eglu::NativeDisplay can't be used with eglGetDisplay()");
-}
-
-void *NativeDisplay::getPlatformNative(void)
-{
-    // If NativeDisplay claims to support CAPABILITY_GET_DISPLAY_PLATFORM then
-    // this method must be implemented.
-    TCU_CHECK_INTERNAL((m_capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT) == 0);
-    TCU_THROW(NotSupportedError,
-              "eglu::NativeDisplay can't be used with eglGetPlatformDisplayEXT()");
-}
-
-const EGLAttrib *NativeDisplay::getPlatformAttributes(void) const
-{
-    // If NativeDisplay claims to support CAPABILITY_GET_DISPLAY_PLATFORM then
-    // this method must be implemented.
-    TCU_CHECK_INTERNAL((m_capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT) == 0);
-    TCU_THROW(NotSupportedError,
-              "eglu::NativeDisplay can't be used with eglGetPlatformDisplayEXT()");
-}
-
-// NativeDisplayFactory
-
-NativeDisplayFactory::NativeDisplayFactory(const std::string &name,
-                                           const std::string &description,
-                                           NativeDisplay::Capability capabilities,
-                                           EGLenum platformType,
-                                           const char *platformExtension)
-    : FactoryBase(name, description),
-      m_capabilities(capabilities),
-      m_platformType(platformType),
-      m_platformExtension(platformExtension)
-{
-    DE_ASSERT(platformType != EGL_NONE && platformExtension);
-    DE_ASSERT(capabilities & NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM_EXT);
-}
-
-NativeDisplayFactory::NativeDisplayFactory(const std::string &name,
-                                           const std::string &description,
-                                           NativeDisplay::Capability capabilities)
-    : FactoryBase(name, description),
-      m_capabilities(capabilities),
-      m_platformType(EGL_NONE),
-      m_platformExtension("")
-{
-    DE_ASSERT(!(capabilities & NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM_EXT));
-    DE_ASSERT(capabilities & NativeDisplay::CAPABILITY_GET_DISPLAY_LEGACY);
-}
-
-NativeDisplayFactory::~NativeDisplayFactory(void) {}
-
-}  // namespace eglu

src/tests/deqp_support/egluNativeDisplay_override.hpp

-#ifndef _EGLUNATIVEDISPLAY_HPP
-#define _EGLUNATIVEDISPLAY_HPP
-/*-------------------------------------------------------------------------
- * drawElements Quality Program Tester Core
- * ----------------------------------------
- *
- * Copyright 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *//*!
- * \file
- * \brief EGL native display abstraction
- *//*--------------------------------------------------------------------*/
-
-#include "tcuDefs.hpp"
-#include "tcuFactoryRegistry.hpp"
-#include "egluNativeWindow.hpp"
-#include "egluNativePixmap.hpp"
-#include "eglwDefs.hpp"
-
-#include <string>
-
-namespace eglw
-{
-class Library;
-}
-
-namespace eglu
-{
-
-class NativeDisplay
-{
-public:
-	enum Capability
-	{
-		CAPABILITY_GET_DISPLAY_LEGACY		= (1<<0),	//!< Query EGL display using eglGetDisplay()
-		CAPABILITY_GET_DISPLAY_PLATFORM		= (1<<1),	//!< Query EGL display using eglGetPlatformDisplay()
-		CAPABILITY_GET_DISPLAY_PLATFORM_EXT = (1<<2)	//!< Query EGL display using eglGetPlatformDisplayEXT()
-	};
-
-	virtual								~NativeDisplay				(void);
-
-	virtual const eglw::Library&		getLibrary					(void) const = 0;
-
-	Capability							getCapabilities				(void) const { return m_capabilities; }
-	eglw::EGLenum						getPlatformType				(void) const { return m_platformType; }
-	const char*							getPlatformExtensionName	(void) const { return (m_platformExtension.empty() ? DE_NULL : m_platformExtension.c_str()); }
-
-	//! Get EGLNativeDisplayType that can be used with eglGetDisplay(). Default implementation throws tcu::NotSupportedError().
-	virtual eglw::EGLNativeDisplayType	getLegacyNative				(void);
-
-	//! Return display pointer that can be used with eglGetPlatformDisplay(). Default implementations throw tcu::NotSupportedError()
-	virtual void*						getPlatformNative			(void);
-
-	//! Attributes to pass to eglGetPlatformDisplay(EXT)
-	virtual const eglw::EGLAttrib*		getPlatformAttributes		(void) const;
-
-protected:
-										NativeDisplay				(Capability capabilities, eglw::EGLenum platformType, const char* platformExtension);
-										NativeDisplay				(Capability capabilities);
-
-private:
-										NativeDisplay				(const NativeDisplay&);
-	NativeDisplay&						operator=					(const NativeDisplay&);
-
-	const Capability					m_capabilities;
-	const eglw::EGLenum					m_platformType;				//!< EGL platform type, or EGL_NONE if not supported.
-	const std::string					m_platformExtension;
-};
-
-class NativeDisplayFactory : public tcu::FactoryBase
-{
-public:
-	virtual								~NativeDisplayFactory		(void);
-
-	virtual NativeDisplay*				createDisplay				(const eglw::EGLAttrib* attribList = DE_NULL) const = 0;
-
-	NativeDisplay::Capability			getCapabilities				(void) const { return m_capabilities; }
-	eglw::EGLenum						getPlatformType				(void) const { return m_platformType; }
-	const char*							getPlatformExtensionName	(void) const { return (m_platformExtension.empty() ? DE_NULL : m_platformExtension.c_str()); }
-
-	const NativeWindowFactoryRegistry&	getNativeWindowRegistry		(void) const { return m_nativeWindowRegistry; }
-	const NativePixmapFactoryRegistry&	getNativePixmapRegistry		(void) const { return m_nativePixmapRegistry; }
-
-protected:
-										NativeDisplayFactory		(const std::string& name, const std::string& description, NativeDisplay::Capability capabilities);
-										NativeDisplayFactory		(const std::string& name, const std::string& description, NativeDisplay::Capability capabilities, eglw::EGLenum platformType, const char* platformExtension);
-
-	NativeWindowFactoryRegistry			m_nativeWindowRegistry;
-	NativePixmapFactoryRegistry			m_nativePixmapRegistry;
-
-private:
-										NativeDisplayFactory		(const NativeDisplayFactory&);
-	NativeDisplayFactory&				operator=					(const NativeDisplayFactory&);
-
-	const NativeDisplay::Capability		m_capabilities;
-	const eglw::EGLenum					m_platformType;
-	const std::string					m_platformExtension;
-};
-
-typedef tcu::FactoryRegistry<NativeDisplayFactory> NativeDisplayFactoryRegistry;
-
-} // eglu
-
-#endif // _EGLUNATIVEDISPLAY_HPP

src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include "egluNativeDisplay_override.hpp"
+#include "egluNativeDisplay.hpp"
 
 #include "tcuANGLENativeDisplayFactory.h"