Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Side by Side Diff: gyp/gpu.gypi

Issue 1316513002: Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (Closed) Base URL: https://skia.googlesource.com/skia.git@things
Patch Set: Address comments, fix roll(?) Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gm/dcshader.cpp ('k') | include/core/SkShader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # Include this gypi to include all 'gpu' files 5 # Include this gypi to include all 'gpu' files
6 # The parent gyp/gypi file must define 6 # The parent gyp/gypi file must define
7 # 'skia_src_path' e.g. skia/trunk/src 7 # 'skia_src_path' e.g. skia/trunk/src
8 # 'skia_include_path' e.g. skia/trunk/include 8 # 'skia_include_path' e.g. skia/trunk/include
9 # 9 #
10 # The skia build defines these in common_variables.gypi 10 # The skia build defines these in common_variables.gypi
(...skipping 28 matching lines...) Expand all
39 '<(skia_include_path)/gpu/GrTexture.h', 39 '<(skia_include_path)/gpu/GrTexture.h',
40 '<(skia_include_path)/gpu/GrTextureProvider.h', 40 '<(skia_include_path)/gpu/GrTextureProvider.h',
41 '<(skia_include_path)/gpu/GrTextureAccess.h', 41 '<(skia_include_path)/gpu/GrTextureAccess.h',
42 '<(skia_include_path)/gpu/GrTestUtils.h', 42 '<(skia_include_path)/gpu/GrTestUtils.h',
43 '<(skia_include_path)/gpu/GrTypes.h', 43 '<(skia_include_path)/gpu/GrTypes.h',
44 '<(skia_include_path)/gpu/GrXferProcessor.h', 44 '<(skia_include_path)/gpu/GrXferProcessor.h',
45 45
46 '<(skia_include_path)/gpu/effects/GrConstColorProcessor.h', 46 '<(skia_include_path)/gpu/effects/GrConstColorProcessor.h',
47 '<(skia_include_path)/gpu/effects/GrCoverageSetOpXP.h', 47 '<(skia_include_path)/gpu/effects/GrCoverageSetOpXP.h',
48 '<(skia_include_path)/gpu/effects/GrCustomXfermode.h', 48 '<(skia_include_path)/gpu/effects/GrCustomXfermode.h',
49 '<(skia_include_path)/gpu/effects/GrExtractAlphaFragmentProcessor.h',
49 '<(skia_include_path)/gpu/effects/GrPorterDuffXferProcessor.h', 50 '<(skia_include_path)/gpu/effects/GrPorterDuffXferProcessor.h',
50 51
51 '<(skia_include_path)/gpu/gl/GrGLConfig.h', 52 '<(skia_include_path)/gpu/gl/GrGLConfig.h',
52 '<(skia_include_path)/gpu/gl/GrGLExtensions.h', 53 '<(skia_include_path)/gpu/gl/GrGLExtensions.h',
53 '<(skia_include_path)/gpu/gl/GrGLFunctions.h', 54 '<(skia_include_path)/gpu/gl/GrGLFunctions.h',
54 '<(skia_include_path)/gpu/gl/GrGLInterface.h', 55 '<(skia_include_path)/gpu/gl/GrGLInterface.h',
55 '<(skia_include_path)/gpu/gl/GrGLSLPrettyPrint.h', 56 '<(skia_include_path)/gpu/gl/GrGLSLPrettyPrint.h',
56 57
57 '<(skia_src_path)/gpu/GrAAHairLinePathRenderer.cpp', 58 '<(skia_src_path)/gpu/GrAAHairLinePathRenderer.cpp',
58 '<(skia_src_path)/gpu/GrAAHairLinePathRenderer.h', 59 '<(skia_src_path)/gpu/GrAAHairLinePathRenderer.h',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 '<(skia_src_path)/gpu/batches/GrStrokeRectBatch.h', 243 '<(skia_src_path)/gpu/batches/GrStrokeRectBatch.h',
243 '<(skia_src_path)/gpu/batches/GrStencilPathBatch.h', 244 '<(skia_src_path)/gpu/batches/GrStencilPathBatch.h',
244 '<(skia_src_path)/gpu/batches/GrTInstanceBatch.h', 245 '<(skia_src_path)/gpu/batches/GrTInstanceBatch.h',
245 '<(skia_src_path)/gpu/batches/GrVertexBatch.cpp', 246 '<(skia_src_path)/gpu/batches/GrVertexBatch.cpp',
246 '<(skia_src_path)/gpu/batches/GrVertexBatch.h', 247 '<(skia_src_path)/gpu/batches/GrVertexBatch.h',
247 248
248 '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', 249 '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h',
249 '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', 250 '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp',
250 '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', 251 '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h',
251 '<(skia_src_path)/gpu/effects/GrConstColorProcessor.cpp', 252 '<(skia_src_path)/gpu/effects/GrConstColorProcessor.cpp',
253 '<(skia_src_path)/gpu/effects/GrExtractAlphaFragmentProcessor.cpp',
252 '<(skia_src_path)/gpu/effects/GrCoverageSetOpXP.cpp', 254 '<(skia_src_path)/gpu/effects/GrCoverageSetOpXP.cpp',
253 '<(skia_src_path)/gpu/effects/GrCustomXfermode.cpp', 255 '<(skia_src_path)/gpu/effects/GrCustomXfermode.cpp',
254 '<(skia_src_path)/gpu/effects/GrCustomXfermodePriv.h', 256 '<(skia_src_path)/gpu/effects/GrCustomXfermodePriv.h',
255 '<(skia_src_path)/gpu/effects/GrBezierEffect.cpp', 257 '<(skia_src_path)/gpu/effects/GrBezierEffect.cpp',
256 '<(skia_src_path)/gpu/effects/GrBezierEffect.h', 258 '<(skia_src_path)/gpu/effects/GrBezierEffect.h',
257 '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', 259 '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp',
258 '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', 260 '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h',
259 '<(skia_src_path)/gpu/effects/GrConvexPolyEffect.cpp', 261 '<(skia_src_path)/gpu/effects/GrConvexPolyEffect.cpp',
260 '<(skia_src_path)/gpu/effects/GrConvexPolyEffect.h', 262 '<(skia_src_path)/gpu/effects/GrConvexPolyEffect.h',
261 '<(skia_src_path)/gpu/effects/GrBicubicEffect.cpp', 263 '<(skia_src_path)/gpu/effects/GrBicubicEffect.cpp',
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp', 464 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
463 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h', 465 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h',
464 ], 466 ],
465 'skgpu_null_gl_sources': [ 467 'skgpu_null_gl_sources': [
466 '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', 468 '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
467 '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp', 469 '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
468 '<(skia_include_path)/gpu/gl/SkNullGLContext.h', 470 '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
469 ], 471 ],
470 }, 472 },
471 } 473 }
OLDNEW
« no previous file with comments | « gm/dcshader.cpp ('k') | include/core/SkShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698