Commit 950cb606 by Shannon Woods

Create test configuration include guards

BUG=angle:501 Change-Id: I0281cf6de4fbf8ddd142b7af4ea2917f0a0a1569 Reviewed-on: https://chromium-review.googlesource.com/218840Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent df647a2a
...@@ -91,6 +91,10 @@ namespace gl ...@@ -91,6 +91,10 @@ namespace gl
// A macro to indicate unimplemented functionality // A macro to indicate unimplemented functionality
#if defined (ANGLE_TEST_CONFIG)
#define NOASSERT_UNIMPLEMENTED 1
#endif
// Define NOASSERT_UNIMPLEMENTED to non zero to skip the assert fail in the unimplemented checks // Define NOASSERT_UNIMPLEMENTED to non zero to skip the assert fail in the unimplemented checks
// This will allow us to test with some automated test suites (eg dEQP) without crashing // This will allow us to test with some automated test suites (eg dEQP) without crashing
#ifndef NOASSERT_UNIMPLEMENTED #ifndef NOASSERT_UNIMPLEMENTED
......
...@@ -551,8 +551,10 @@ void Display::initDisplayExtensionString() ...@@ -551,8 +551,10 @@ void Display::initDisplayExtensionString()
extensions.push_back("EGL_NV_post_sub_buffer"); extensions.push_back("EGL_NV_post_sub_buffer");
} }
#if defined (ANGLE_TEST_CONFIG)
// TODO: complete support for the EGL_KHR_create_context extension // TODO: complete support for the EGL_KHR_create_context extension
extensions.push_back("EGL_KHR_create_context"); extensions.push_back("EGL_KHR_create_context");
#endif
std::ostringstream stream; std::ostringstream stream;
std::copy(extensions.begin(), extensions.end(), std::ostream_iterator<std::string>(stream, " ")); std::copy(extensions.begin(), extensions.end(), std::ostream_iterator<std::string>(stream, " "));
......
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
#include "libGLESv2/renderer/d3d/d3d11/Renderer11.h" #include "libGLESv2/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 0 #define ANGLE_DEFAULT_D3D11 0
......
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