Mesa (master): glx/tests: honor enable-driglx-direct configure flag
Emil Velikov
evelikov at kemper.freedesktop.org
Tue Mar 11 13:07:20 UTC 2014
Module: Mesa
Branch: master
Commit: e5214dd8f1356ac77e9caed5abb2b76deb27a920
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5214dd8f1356ac77e9caed5abb2b76deb27a920
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Tue Nov 12 17:32:13 2013 +0000
glx/tests: honor enable-driglx-direct configure flag
Recent commit fixed build issues in dri2_query_renderer.c by
wrapping in defined(direct_rendering) && !defined(applegl)
This patch targets the query_renderer tests, so that make check
passes on platforms such as hurd and cygwin.
v2: (Emil)
- Rebase and update commit message.
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/glx/tests/query_renderer_implementation_unittest.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
index 4749089..2bf8843 100644
--- a/src/glx/tests/query_renderer_implementation_unittest.cpp
+++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
@@ -24,6 +24,8 @@
#include <signal.h>
#include <setjmp.h>
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+
extern "C" {
#include "glxclient.h"
#include "glx_error.h"
@@ -308,3 +310,5 @@ TEST_F(dri2_query_renderer_integer_test, valid_attribute_mapping)
EXPECT_FALSE(got_sigsegv);
}
}
+
+#endif /* GLX_DIRECT_RENDERING */
More information about the mesa-commit
mailing list