AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Chrome iOS no GPU build and block includes from src/gpu on our NoGpu bot.

Browse Source 
Change-Id: I934f0d6096a6eb0305e24f06dfb6c49299a195a9
Reviewed-on: https://skia-review.googlesource.com/8919
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2017-02-23 12:23:47 -05:00 committed by Skia Commit-Bot
parent 8e15cdf778
commit 03e058414c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -99,7 +99,6 @@ config("skia_private") {
"src/effects",
"src/effects/gradients",
"src/fonts",
"src/gpu",
"src/image",
"src/images",
"src/lazy",
@ -148,6 +147,9 @@ config("skia_private") {
libs += [ "vulkan" ]
}
}
if (skia_enable_gpu) {
include_dirs += [ "src/gpu" ]
}
if (skia_use_angle) {
defines += [ "SK_ANGLE" ]
}

2
src/effects/gradients/SkGradientShader.cpp
View File

@ -8,7 +8,6 @@
#include "Sk4fLinearGradient.h"
#include "SkColorSpace_XYZ.h"
#include "SkGradientShaderPriv.h"
#include "SkGrPriv.h"
#include "SkHalf.h"
#include "SkLinearGradient.h"
#include "SkRadialGradient.h"
@ -1130,6 +1129,7 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
#include "glsl/GrGLSLProgramDataManager.h"
#include "glsl/GrGLSLUniformHandler.h"
#include "SkGr.h"
#include "SkGrPriv.h"
static inline bool close_to_one_half(const SkFixed& val) {
return SkScalarNearlyEqual(SkFixedToScalar(val), SK_ScalarHalf);

1
tests/BitmapCopyTest.cpp
View File

@ -6,7 +6,6 @@
*/
#include "SkBitmap.h"
#include "SkGrPriv.h"
#include "SkRect.h"
#include "SkTemplates.h"
#include "Test.h"