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

Side by Side Diff: gyp/gpu.gypi

Issue 1404433002: Remove image usage type enum. Use GrTextureParams instead. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix no gpu build Created 5 years, 2 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 | « gyp/core.gypi ('k') | include/core/SkImageGenerator.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 18 matching lines...) Expand all
29 '<(skia_include_path)/gpu/GrProcessor.h', 29 '<(skia_include_path)/gpu/GrProcessor.h',
30 '<(skia_include_path)/gpu/GrProcessorUnitTest.h', 30 '<(skia_include_path)/gpu/GrProcessorUnitTest.h',
31 '<(skia_include_path)/gpu/GrProgramElement.h', 31 '<(skia_include_path)/gpu/GrProgramElement.h',
32 '<(skia_include_path)/gpu/GrGpuResourceRef.h', 32 '<(skia_include_path)/gpu/GrGpuResourceRef.h',
33 '<(skia_include_path)/gpu/GrRect.h', 33 '<(skia_include_path)/gpu/GrRect.h',
34 '<(skia_include_path)/gpu/GrRenderTarget.h', 34 '<(skia_include_path)/gpu/GrRenderTarget.h',
35 '<(skia_include_path)/gpu/GrResourceKey.h', 35 '<(skia_include_path)/gpu/GrResourceKey.h',
36 '<(skia_include_path)/gpu/GrShaderVar.h', 36 '<(skia_include_path)/gpu/GrShaderVar.h',
37 '<(skia_include_path)/gpu/GrSurface.h', 37 '<(skia_include_path)/gpu/GrSurface.h',
38 '<(skia_include_path)/gpu/GrTexture.h', 38 '<(skia_include_path)/gpu/GrTexture.h',
39 '<(skia_include_path)/gpu/GrTextureParams.h',
39 '<(skia_include_path)/gpu/GrTextureProvider.h', 40 '<(skia_include_path)/gpu/GrTextureProvider.h',
40 '<(skia_include_path)/gpu/GrTextureAccess.h', 41 '<(skia_include_path)/gpu/GrTextureAccess.h',
41 '<(skia_include_path)/gpu/GrTestUtils.h', 42 '<(skia_include_path)/gpu/GrTestUtils.h',
42 '<(skia_include_path)/gpu/GrTypes.h', 43 '<(skia_include_path)/gpu/GrTypes.h',
43 '<(skia_include_path)/gpu/GrXferProcessor.h', 44 '<(skia_include_path)/gpu/GrXferProcessor.h',
44 45
45 '<(skia_include_path)/gpu/effects/GrConstColorProcessor.h', 46 '<(skia_include_path)/gpu/effects/GrConstColorProcessor.h',
46 '<(skia_include_path)/gpu/effects/GrCoverageSetOpXP.h', 47 '<(skia_include_path)/gpu/effects/GrCoverageSetOpXP.h',
47 '<(skia_include_path)/gpu/effects/GrCustomXfermode.h', 48 '<(skia_include_path)/gpu/effects/GrCustomXfermode.h',
48 '<(skia_include_path)/gpu/effects/GrPorterDuffXferProcessor.h', 49 '<(skia_include_path)/gpu/effects/GrPorterDuffXferProcessor.h',
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp', 446 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
446 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h', 447 '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h',
447 ], 448 ],
448 'skgpu_null_gl_sources': [ 449 'skgpu_null_gl_sources': [
449 '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp', 450 '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
450 '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp', 451 '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
451 '<(skia_include_path)/gpu/gl/SkNullGLContext.h', 452 '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
452 ], 453 ],
453 }, 454 },
454 } 455 }
OLDNEW
« no previous file with comments | « gyp/core.gypi ('k') | include/core/SkImageGenerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698