[Piglit] [PATCH 05/14] util: Move piglit_use_fbo to piglit-framework.*

[Chad Versace]

piglit_use_fbo was declared and defined in piglit-framework-fbo.{h,c}.

The next commit adds module piglit-framework-glut, which implements
functionality orthogonal to piglit-framework-fbo, and hence shouldn't rely
on its header. That's why piglit_use_fbo should be moved to the neutral
"parent" module, piglit-framework.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/util/piglit-framework-fbo.c |    2 --
 tests/util/piglit-framework-fbo.h |    2 --
 tests/util/piglit-framework.c     |    1 +
 tests/util/piglit-framework.h     |    3 +++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/util/piglit-framework-fbo.c b/tests/util/piglit-framework-fbo.c
index 37411e3..0b940f3 100644
--- a/tests/util/piglit-framework-fbo.c
+++ b/tests/util/piglit-framework-fbo.c
@@ -48,8 +48,6 @@
 #include <waffle/waffle.h>
 #endif
 
-bool piglit_use_fbo = false;
-
 #ifdef PIGLIT_FRAMEWORK_FBO_USE_GLX
 Display *piglit_glx_dpy;
 Window piglit_glx_window;
diff --git a/tests/util/piglit-framework-fbo.h b/tests/util/piglit-framework-fbo.h
index c31f206..2fdf79d 100644
--- a/tests/util/piglit-framework-fbo.h
+++ b/tests/util/piglit-framework-fbo.h
@@ -23,7 +23,5 @@
 
 #include <stdbool.h>
 
-extern bool piglit_use_fbo;
-
 bool piglit_framework_fbo_init(void);
 void piglit_framework_fbo_destroy(void);
diff --git a/tests/util/piglit-framework.c b/tests/util/piglit-framework.c
index 0b43313..1a0a0a8 100644
--- a/tests/util/piglit-framework.c
+++ b/tests/util/piglit-framework.c
@@ -40,6 +40,7 @@
 #include "piglit-glx-util.h"
 #endif
 
+bool piglit_use_fbo = false;
 int piglit_automatic = 0;
 unsigned piglit_winsys_fbo = 0;
 
diff --git a/tests/util/piglit-framework.h b/tests/util/piglit-framework.h
index b7f5d57..a01b050 100644
--- a/tests/util/piglit-framework.h
+++ b/tests/util/piglit-framework.h
@@ -23,11 +23,14 @@
 
 #pragma once
 
+#include <stdbool.h>
+
 extern int piglit_automatic;
 
 extern int piglit_window_mode;
 extern int piglit_width;
 extern int piglit_height;
+extern bool piglit_use_fbo;
 extern unsigned int piglit_winsys_fbo;
 
 extern enum piglit_result piglit_display(void);
-- 
1.7.10.4