diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-03 14:54:45 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-03 14:54:45 +0000 |
| commit | 2a48c3adb7cf4fc754f99a41352210b4a99edf04 (patch) | |
| tree | 18a6f6180e8df17861a2b19f3b4f13328acb97ea /tests | |
| parent | d472620458e2383e6dd949f4e1aaf61160717ffe (diff) | |
Fix includes files missing in release builds from GrCustomStageUnitTest.h.
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index a43ad834ef..199cc4989d 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -8,6 +8,10 @@ // 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" @@ -17,8 +21,6 @@ #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 |