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

Side by Side Diff: gyp/gpu.gypi

Issue 2123693002: Revert of Begin instanced rendering for simple shapes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | include/gpu/GrDrawContext.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 '<(skia_include_path)/gpu/gl/GrGLAssembleInterface.h', 53 '<(skia_include_path)/gpu/gl/GrGLAssembleInterface.h',
54 '<(skia_include_path)/gpu/gl/GrGLConfig.h', 54 '<(skia_include_path)/gpu/gl/GrGLConfig.h',
55 '<(skia_include_path)/gpu/gl/GrGLExtensions.h', 55 '<(skia_include_path)/gpu/gl/GrGLExtensions.h',
56 '<(skia_include_path)/gpu/gl/GrGLFunctions.h', 56 '<(skia_include_path)/gpu/gl/GrGLFunctions.h',
57 '<(skia_include_path)/gpu/gl/GrGLInterface.h', 57 '<(skia_include_path)/gpu/gl/GrGLInterface.h',
58 '<(skia_include_path)/gpu/gl/GrGLSLPrettyPrint.h', 58 '<(skia_include_path)/gpu/gl/GrGLSLPrettyPrint.h',
59 '<(skia_include_path)/gpu/gl/GrGLTypes.h', 59 '<(skia_include_path)/gpu/gl/GrGLTypes.h',
60 60
61 # Private includes 61 # Private includes
62 '<(skia_include_path)/private/GrAuditTrail.h', 62 '<(skia_include_path)/private/GrAuditTrail.h',
63 '<(skia_include_path)/private/GrInstancedPipelineInfo.h',
64 '<(skia_include_path)/private/GrSingleOwner.h', 63 '<(skia_include_path)/private/GrSingleOwner.h',
65 '<(skia_include_path)/private/GrRenderTargetProxy.h', 64 '<(skia_include_path)/private/GrRenderTargetProxy.h',
66 '<(skia_include_path)/private/GrSurfaceProxy.h', 65 '<(skia_include_path)/private/GrSurfaceProxy.h',
67 '<(skia_include_path)/private/GrTextureProxy.h', 66 '<(skia_include_path)/private/GrTextureProxy.h',
68 67
69 '<(skia_src_path)/gpu/GrAuditTrail.cpp', 68 '<(skia_src_path)/gpu/GrAuditTrail.cpp',
70 '<(skia_src_path)/gpu/GrAutoLocaleSetter.h', 69 '<(skia_src_path)/gpu/GrAutoLocaleSetter.h',
71 '<(skia_src_path)/gpu/GrAllocator.h', 70 '<(skia_src_path)/gpu/GrAllocator.h',
72 '<(skia_src_path)/gpu/GrBatchAtlas.cpp', 71 '<(skia_src_path)/gpu/GrBatchAtlas.cpp',
73 '<(skia_src_path)/gpu/GrBatchAtlas.h', 72 '<(skia_src_path)/gpu/GrBatchAtlas.h',
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', 301 '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp',
303 '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h', 302 '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h',
304 '<(skia_src_path)/gpu/effects/GrTextureDomain.cpp', 303 '<(skia_src_path)/gpu/effects/GrTextureDomain.cpp',
305 '<(skia_src_path)/gpu/effects/GrTextureDomain.h', 304 '<(skia_src_path)/gpu/effects/GrTextureDomain.h',
306 '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', 305 '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp',
307 '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', 306 '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h',
308 '<(skia_src_path)/gpu/effects/GrXfermodeFragmentProcessor.cpp', 307 '<(skia_src_path)/gpu/effects/GrXfermodeFragmentProcessor.cpp',
309 '<(skia_src_path)/gpu/effects/GrYUVEffect.cpp', 308 '<(skia_src_path)/gpu/effects/GrYUVEffect.cpp',
310 '<(skia_src_path)/gpu/effects/GrYUVEffect.h', 309 '<(skia_src_path)/gpu/effects/GrYUVEffect.h',
311 310
312 '<(skia_src_path)/gpu/instanced/InstancedRendering.cpp',
313 '<(skia_src_path)/gpu/instanced/InstancedRendering.h',
314 '<(skia_src_path)/gpu/instanced/InstancedRenderingTypes.h',
315 '<(skia_src_path)/gpu/instanced/InstanceProcessor.cpp',
316 '<(skia_src_path)/gpu/instanced/InstanceProcessor.h',
317 '<(skia_src_path)/gpu/instanced/GLInstancedRendering.cpp',
318 '<(skia_src_path)/gpu/instanced/GLInstancedRendering.h',
319
320 # text 311 # text
321 '<(skia_src_path)/gpu/text/GrAtlasTextBlob.cpp', 312 '<(skia_src_path)/gpu/text/GrAtlasTextBlob.cpp',
322 '<(skia_src_path)/gpu/text/GrAtlasTextBlob_regenInBatch.cpp', 313 '<(skia_src_path)/gpu/text/GrAtlasTextBlob_regenInBatch.cpp',
323 '<(skia_src_path)/gpu/text/GrAtlasTextBlob.h', 314 '<(skia_src_path)/gpu/text/GrAtlasTextBlob.h',
324 '<(skia_src_path)/gpu/text/GrAtlasTextContext.cpp', 315 '<(skia_src_path)/gpu/text/GrAtlasTextContext.cpp',
325 '<(skia_src_path)/gpu/text/GrAtlasTextContext.h', 316 '<(skia_src_path)/gpu/text/GrAtlasTextContext.h',
326 '<(skia_src_path)/gpu/text/GrBatchFontCache.cpp', 317 '<(skia_src_path)/gpu/text/GrBatchFontCache.cpp',
327 '<(skia_src_path)/gpu/text/GrBatchFontCache.h', 318 '<(skia_src_path)/gpu/text/GrBatchFontCache.h',
328 '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.cpp', 319 '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.cpp',
329 '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.h', 320 '<(skia_src_path)/gpu/text/GrDistanceFieldAdjustTable.h',
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp', 516 '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
526 '<(skia_src_path)/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp', 517 '<(skia_src_path)/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
527 '<(skia_src_path)/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp', 518 '<(skia_src_path)/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp',
528 '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp', 519 '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp',
529 '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp', 520 '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
530 ], 521 ],
531 'skgpu_null_gl_sources': [ 522 'skgpu_null_gl_sources': [
532 ], 523 ],
533 }, 524 },
534 } 525 }
OLDNEW
« no previous file with comments | « no previous file | include/gpu/GrDrawContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698