i965: Emit CS stall before MEDIA_VFE_STATE.

[mesa.git] / src / glx / tests / query_renderer_implementation_unittest.cpp

diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
index 474908939d6c98e65214fa32b6beef4f6cac13aa..c3f5cc7214ac037fe392242b460964d4b39abcd6 100644 (file)
--- a/src/glx/tests/query_renderer_implementation_unittest.cpp
+++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
@@ -24,14 +24,13 @@
 #include <signal.h>
 #include <setjmp.h>
 
-extern "C" {
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+
 #include "glxclient.h"
 #include "glx_error.h"
-#include "xf86drm.h"
 #include "dri2.h"
 #include "dri_interface.h"
 #include "dri2_priv.h"
-}
 
 struct attribute_test_vector {
    const char *glx_string;
@@ -139,7 +138,7 @@ fake_queryString(__DRIscreen *screen, int attribute, const char **val)
    return -1;
 }
 
-struct __DRI2rendererQueryExtensionRec rendererQueryExt = {
+static const __DRI2rendererQueryExtension rendererQueryExt = {
    { __DRI2_RENDERER_QUERY, 1 },
 
    fake_queryInteger,
@@ -308,3 +307,5 @@ TEST_F(dri2_query_renderer_integer_test, valid_attribute_mapping)
       EXPECT_FALSE(got_sigsegv);
    }
 }
+
+#endif /* GLX_DIRECT_RENDERING */