aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2014-12-05 12:14:26 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-05 12:14:27 -0800
commit8bf2bd335f39afc29d7829ad11aa440945c2d37a (patch)
treefa68a2fd4406b468df66d93bcfcd7b7cfb51828d
parent69469b570ceb8a5ab7f64778d1b128cd5c472e73 (diff)
Move GrPorterDuffXferProcessor to include/gpu/effects.
-rw-r--r--gyp/gpu.gyp2
-rw-r--r--gyp/gpu.gypi3
-rw-r--r--include/gpu/effects/GrPorterDuffXferProcessor.h (renamed from src/gpu/effects/GrPorterDuffXferProcessor.h)0
3 files changed, 4 insertions, 1 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 631945607d..84af64a8ea 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -74,6 +74,7 @@
],
'include_dirs': [
'../include/gpu',
+ '../include/gpu/effects',
],
},
},
@@ -94,6 +95,7 @@
],
'include_dirs': [
'../include/gpu',
+ '../include/gpu/effects',
'../src/core',
'../src/gpu',
],
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index c301999d98..dd22065c5d 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -35,6 +35,8 @@
'<(skia_include_path)/gpu/GrUserConfig.h',
'<(skia_include_path)/gpu/GrXferProcessor.h',
+ '<(skia_include_path)/gpu/effects/GrPorterDuffXferProcessor.h',
+
'<(skia_include_path)/gpu/gl/GrGLConfig.h',
'<(skia_include_path)/gpu/gl/GrGLExtensions.h',
'<(skia_include_path)/gpu/gl/GrGLFunctions.h',
@@ -194,7 +196,6 @@
'<(skia_src_path)/gpu/effects/GrOvalEffect.cpp',
'<(skia_src_path)/gpu/effects/GrOvalEffect.h',
'<(skia_src_path)/gpu/effects/GrPorterDuffXferProcessor.cpp',
- '<(skia_src_path)/gpu/effects/GrPorterDuffXferProcessor.h',
'<(skia_src_path)/gpu/effects/GrRRectEffect.cpp',
'<(skia_src_path)/gpu/effects/GrRRectEffect.h',
'<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.cpp',
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.h b/include/gpu/effects/GrPorterDuffXferProcessor.h
index d1b30cc931..d1b30cc931 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.h
+++ b/include/gpu/effects/GrPorterDuffXferProcessor.h