Move SK_SUPPORT_GPU checks below first #includes in case the macro is defined in SkUserConfig.h rather than by the build system.
git-svn-id: http://skia.googlecode.com/svn/trunk@4948 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 2c9b6ed..927ee17 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -7,9 +7,10 @@
*/
// This test only works with the GPU backend.
-#if SK_SUPPORT_GPU
#include "gm.h"
+
+#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "effects/GrSingleTextureEffect.h"
#include "SkColorPriv.h"
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index db6ffd0..b0be2f1 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -6,11 +6,9 @@
*/
-// This is a GR test
-
-#if SK_SUPPORT_GPU
-
#include "Test.h"
+// This is a GR test
+#if SK_SUPPORT_GPU
#include "SkGpuDevice.h"
#include "../../src/gpu/GrClipMaskManager.h"
diff --git a/tests/GLInterfaceValidation.cpp b/tests/GLInterfaceValidation.cpp
index 881a4c9..c49de3e 100755
--- a/tests/GLInterfaceValidation.cpp
+++ b/tests/GLInterfaceValidation.cpp
@@ -7,10 +7,11 @@
*/
+
+#include "Test.h"
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
-#include "Test.h"
#if SK_ANGLE
#include "gl/SkANGLEGLContext.h"
#endif
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index 6c14dbe..17ff69d 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -5,10 +5,9 @@
* found in the LICENSE file.
*/
+#include "Test.h"
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
-
-#include "Test.h"
#include "GrMemoryPool.h"
#include "SkRandom.h"
#include "SkTDArray.h"