diff options
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 8 | ||||
| -rw-r--r-- | dm/DMGpuSupport.h | 2 | ||||
| -rw-r--r-- | include/gpu/gl/GrGLFunctions.h | 1 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlags.cpp | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index 2890483f55..fb170a26b9 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -22,8 +22,6 @@ GpuGMTask::GpuGMTask(const char* config, , fSampleCount(sampleCount) {} -static bool gAlreadyWarned[GrContextFactory::kGLContextTypeCnt][kGrGLStandardCnt]; - void GpuGMTask::draw(GrContextFactory* grFactory) { SkImageInfo info = SkImageInfo::Make(SkScalarCeilToInt(fGM->width()), SkScalarCeilToInt(fGM->height()), @@ -32,11 +30,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) { SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, fGpuAPI, info, fSampleCount)); if (!surface) { - if (!gAlreadyWarned[fContextType][fGpuAPI]) { - SkDebugf("FYI: couldn't create GPU context, type %d API %d. Will skip.\n", - fContextType, fGpuAPI); - gAlreadyWarned[fContextType][fGpuAPI] = true; - } + this->fail("Could not create context for the config and the api."); return; } SkCanvas* canvas = surface->getCanvas(); diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h index 90b0ea55cf..af6270dfc3 100644 --- a/dm/DMGpuSupport.h +++ b/dm/DMGpuSupport.h @@ -36,7 +36,6 @@ enum GrGLStandard { kGL_GrGLStandard, kGLES_GrGLStandard }; -static const int kGrGLStandardCnt = 3; class GrContextFactory { public: @@ -48,7 +47,6 @@ public: kNVPR_GLContextType = 0, kNative_GLContextType = 0, kNull_GLContextType = 0; - static const int kGLContextTypeCnt = 1; void destroyContexts() {} void abandonContexts() {} diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index 0b7beb601f..dd62085012 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -22,7 +22,6 @@ enum GrGLStandard { kGL_GrGLStandard, kGLES_GrGLStandard, }; -static const int kGrGLStandardCnt = 3; /////////////////////////////////////////////////////////////////////////////// diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index 4d329c5f30..99d05c15f7 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -7,7 +7,7 @@ #include "SkCommonFlags.h" -DEFINE_string(config, "565 8888 pdf gpu nonrendering angle nvprmsaa4", +DEFINE_string(config, "565 8888 pdf gpu nonrendering angle", "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 " "gpunull gpudebug angle mesa"); |