Commit 2f6435e0 by Geoff Lang Committed by Commit Bot

Change UNIMPLEMENTED to not assert by default.

It is not feasible to run dEQP against ES 3.1 on the bots without removing this assertion. Messages will still be logged and UNREACHABLE will still generate assertion failures when the behaviour is needed. This matches the behaviour of Chromium's NOTIMPLEMENTED macro. Remove the ANGLE_TEST_CONFIG macro, it was not doing anything useful anymore. BUG=angleproject:1442 Change-Id: I76376817a87e1a75ad1a938e1db1d7763e094372 Reviewed-on: https://chromium-review.googlesource.com/406928Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent d2f0c74c
...@@ -156,19 +156,13 @@ std::ostream &DummyStream(); ...@@ -156,19 +156,13 @@ std::ostream &DummyStream();
#define UNUSED_VARIABLE(variable) ((void)variable) #define UNUSED_VARIABLE(variable) ((void)variable)
// A macro to indicate unimplemented functionality // A macro to indicate unimplemented functionality
#if defined (ANGLE_TEST_CONFIG)
#define NOASSERT_UNIMPLEMENTED 1
#endif
// This will allow us to test with some automated test suites (eg dEQP) without crashing
#ifndef NOASSERT_UNIMPLEMENTED #ifndef NOASSERT_UNIMPLEMENTED
#define NOASSERT_UNIMPLEMENTED 0 #define NOASSERT_UNIMPLEMENTED 1
#endif #endif
#define UNIMPLEMENTED() \ #define UNIMPLEMENTED() \
{ \ { \
FIXME("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__); \ ERR("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__); \
ASSERT(NOASSERT_UNIMPLEMENTED); \ ASSERT(NOASSERT_UNIMPLEMENTED); \
} \ } \
ANGLE_EMPTY_STATEMENT ANGLE_EMPTY_STATEMENT
......
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
# include "libANGLE/renderer/d3d/d3d11/Renderer11.h" # include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#endif // ANGLE_ENABLE_D3D11 #endif // ANGLE_ENABLE_D3D11
#if defined (ANGLE_TEST_CONFIG)
# define ANGLE_DEFAULT_D3D11 1
#endif
#if !defined(ANGLE_DEFAULT_D3D11) #if !defined(ANGLE_DEFAULT_D3D11)
// Enables use of the Direct3D 11 API for a default display, when available // Enables use of the Direct3D 11 API for a default display, when available
# define ANGLE_DEFAULT_D3D11 1 # define ANGLE_DEFAULT_D3D11 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment