зеркало из https://github.com/mozilla/moz-skia.git
fix bench so that if SK_SUPPORTS_GPU even when not provided as compiler option
In the case that SK_SUPPORTS_GPU is not provided to the compiler the value is eithe defined in in the SkUserConfig.h or SkPostConfig.h. Prior to this change those headers were not read prior to trying to include the GPU headers which resulted in a failed compile. R=bsalomon@google.com Review URL: https://codereview.chromium.org/76213004 git-svn-id: http://skia.googlecode.com/svn/trunk@12309 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
10822c6daa
Коммит
db490e9971
|
@ -1,4 +1,3 @@
|
|||
|
||||
/*
|
||||
* Copyright 2011 Google Inc.
|
||||
*
|
||||
|
@ -6,16 +5,6 @@
|
|||
* found in the LICENSE file.
|
||||
*/
|
||||
|
||||
#if SK_SUPPORT_GPU
|
||||
#include "GrContext.h"
|
||||
#include "GrContextFactory.h"
|
||||
#include "GrRenderTarget.h"
|
||||
#include "SkGpuDevice.h"
|
||||
#include "gl/GrGLDefines.h"
|
||||
#else
|
||||
class GrContext;
|
||||
#endif // SK_SUPPORT_GPU
|
||||
|
||||
#include "BenchTimer.h"
|
||||
#include "SkBenchLogger.h"
|
||||
#include "SkBenchmark.h"
|
||||
|
@ -30,6 +19,16 @@ class GrContext;
|
|||
#include "SkPicture.h"
|
||||
#include "SkString.h"
|
||||
|
||||
#if SK_SUPPORT_GPU
|
||||
#include "GrContext.h"
|
||||
#include "GrContextFactory.h"
|
||||
#include "GrRenderTarget.h"
|
||||
#include "SkGpuDevice.h"
|
||||
#include "gl/GrGLDefines.h"
|
||||
#else
|
||||
class GrContext;
|
||||
#endif // SK_SUPPORT_GPU
|
||||
|
||||
#include <limits>
|
||||
|
||||
enum BenchMode {
|
||||
|
|
Загрузка…
Ссылка в новой задаче