Also fix SK_SUPPORT_GPU=0 build breaks in gmmain.cpp and GLProgramsTest.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@4947
2bbb7eff-a529-9590-31e7-
b0007b416f81
#include "SkPicture.h"
#include "SkRefCnt.h"
#include "SkStream.h"
+#include "SkTArray.h"
#include "SamplePipeControllers.h"
#if SK_SUPPORT_GPU
#define GrCustomStageUnitTest_DEFINED
#include "SkRandom.h"
+#include "GrNoncopyable.h"
+#include "SkTArray.h"
#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
// This is a GPU-backend specific test. It relies on static intializers to work
+#include "SkTypes.h"
+
+#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+
#include "gl/GrGpuGL.h"
#include "effects/GrColorTableEffect.h"
#include "effects/GrConvolutionEffect.h"
#include "GrRandom.h"
#include "Test.h"
-#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-
namespace {
// GrRandoms nextU() values have patterns in the low bits