| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright 2013 Google Inc. |    2  * Copyright 2013 Google Inc. | 
|    3  * |    3  * | 
|    4  * Use of this source code is governed by a BSD-style license that can be |    4  * Use of this source code is governed by a BSD-style license that can be | 
|    5  * found in the LICENSE file. |    5  * found in the LICENSE file. | 
|    6  */ |    6  */ | 
|    7  |    7  | 
|    8 #include "GrContext.h" |    8 #include "GrContext.h" | 
|    9 #include "GrContextFactory.h" |    9 #include "GrContextFactory.h" | 
|   10 #include "GrRenderTarget.h" |   10 #include "GrRenderTarget.h" | 
|   11 #include "SkGpuDevice.h" |   11 #include "SkGpuDevice.h" | 
|   12 #include "gl/GrGLDefines.h" |   12 #include "gl/GrGLDefines.h" | 
|   13  |   13  | 
|   14 #include "SkBitmap.h" |   14 #include "SkBitmap.h" | 
|   15 #include "SkCanvas.h" |   15 #include "SkCanvas.h" | 
|   16 #include "SkColor.h" |   16 #include "SkColor.h" | 
|   17 #include "SkGraphics.h" |   17 #include "SkGraphics.h" | 
|   18 #include "SkImageEncoder.h" |   18 #include "SkImageEncoder.h" | 
|   19 #include "SkOSFile.h" |   19 #include "SkOSFile.h" | 
|   20 #include "SkPicture.h" |   20 #include "SkPicture.h" | 
|   21 #include "SkRTConf.h" |  | 
|   22 #include "SkStream.h" |   21 #include "SkStream.h" | 
|   23 #include "SkString.h" |   22 #include "SkString.h" | 
|   24 #include "SkTArray.h" |   23 #include "SkTArray.h" | 
|   25 #include "SkTDArray.h" |   24 #include "SkTDArray.h" | 
|   26 #include "SkTaskGroup.h" |   25 #include "SkTaskGroup.h" | 
|   27 #include "SkTime.h" |   26 #include "SkTime.h" | 
|   28 #include "Test.h" |   27 #include "Test.h" | 
|   29  |   28  | 
|   30 #if !SK_SUPPORT_GPU |   29 #if !SK_SUPPORT_GPU | 
|   31 #error "GPU support required" |   30 #error "GPU support required" | 
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  560     } |  559     } | 
|  561  |  560  | 
|  562 private: |  561 private: | 
|  563     int fDirNo; |  562     int fDirNo; | 
|  564     int fIndex; |  563     int fIndex; | 
|  565     SkTArray<TestResult, true> fResults; |  564     SkTArray<TestResult, true> fResults; | 
|  566     SkString fStatusPath; |  565     SkString fStatusPath; | 
|  567 }; |  566 }; | 
|  568  |  567  | 
|  569 static bool initTest() { |  568 static bool initTest() { | 
|  570 #if !defined SK_BUILD_FOR_WIN && !defined SK_BUILD_FOR_MAC |  | 
|  571     SK_CONF_SET("images.jpeg.suppressDecoderWarnings", true); |  | 
|  572     SK_CONF_SET("images.png.suppressDecoderWarnings", true); |  | 
|  573 #endif |  | 
|  574     return make_out_dirs(); |  569     return make_out_dirs(); | 
|  575 } |  570 } | 
|  576  |  571  | 
|  577 DEF_TEST(SkpSkGr, reporter) { |  572 DEF_TEST(SkpSkGr, reporter) { | 
|  578     SkTArray<TestResult, true> errors; |  573     SkTArray<TestResult, true> errors; | 
|  579     if (!initTest()) { |  574     if (!initTest()) { | 
|  580         return; |  575         return; | 
|  581     } |  576     } | 
|  582     SkpSkGrThreadState state; |  577     SkpSkGrThreadState state; | 
|  583     state.init(0); |  578     state.init(0); | 
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  744     int testIndex = 166; |  739     int testIndex = 166; | 
|  745     int dirIndex = skipOverSkGr[testIndex - 166].directory; |  740     int dirIndex = skipOverSkGr[testIndex - 166].directory; | 
|  746     SkString pictDir = make_in_dir_name(dirIndex); |  741     SkString pictDir = make_in_dir_name(dirIndex); | 
|  747     if (pictDir.size() == 0) { |  742     if (pictDir.size() == 0) { | 
|  748         return; |  743         return; | 
|  749     } |  744     } | 
|  750     SkString filename(skipOverSkGr[testIndex - 166].filename); |  745     SkString filename(skipOverSkGr[testIndex - 166].filename); | 
|  751     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose
     ()); |  746     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose
     ()); | 
|  752     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose
     ()); |  747     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose
     ()); | 
|  753 } |  748 } | 
| OLD | NEW |