aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-20 18:35:38 +0000
committerGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-20 18:35:38 +0000
commit07eecdca3e331eb4066c53a29305aeea6d692961 (patch)
treed511d99cc07f13525d8a87292c8d48d075b2d8ea /gyp
parent5a2e879ef8a3720ac3f06fbc13dcdaeb179f30c3 (diff)
Hooks up the GrCustomStage/GrGLProgramStageFactory/GrGLProgramStage
classes from r3726 so they can be used. Does not implement any actual effect stages. Has one large known bug: if custom stages are provided, GrSamplerState comparisons will break; this should preserve correct drawing, but decrease performance - among other things, we'll break draw batching. To fix this we'll need a RTTI system for GrCustomState objects, and we'll need to change the GrSamplerState comparison from a memcmp to something that also does a deep type-sensitive compare of any GrCustomState objects present. http://codereview.appspot.com/6074043/ git-svn-id: http://skia.googlecode.com/svn/trunk@3742 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/gpu.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 685eca18be..f0f9821672 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -178,6 +178,7 @@
'../include/gpu/GrConfig.h',
'../include/gpu/GrContext.h',
'../include/gpu/GrContextFactory.h',
+ '../include/gpu/GrCustomStage.h',
'../include/gpu/GrFontScaler.h',
'../include/gpu/GrGlyph.h',
'../include/gpu/GrInstanceCounter.h',
@@ -221,7 +222,6 @@
'../src/gpu/GrClip.cpp',
'../src/gpu/GrContext.cpp',
'../src/gpu/GrCustomStage.cpp',
- '../src/gpu/GrCustomStage.h',
'../src/gpu/GrDefaultPathRenderer.cpp',
'../src/gpu/GrDefaultPathRenderer.h',
'../src/gpu/GrDefaultTextContext.cpp',