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

Side by Side Diff: gyp/gpu.gyp

Issue 146863003: Revert "Turn NVPR on by default (but off in tools)." (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 11 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/common_variables.gypi ('k') | include/gpu/GrContextFactory.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 { 1 {
2 'target_defaults': { 2 'target_defaults': {
3 'conditions': [ 3 'conditions': [
4 ['skia_os != "win"', { 4 ['skia_os != "win"', {
5 'sources/': [ ['exclude', '_win.(h|cpp)$'], 5 'sources/': [ ['exclude', '_win.(h|cpp)$'],
6 ], 6 ],
7 }], 7 }],
8 ['skia_os != "mac"', { 8 ['skia_os != "mac"', {
9 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'], 9 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'],
10 ], 10 ],
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 'sources': [ 100 'sources': [
101 '<@(skgpu_sources)', 101 '<@(skgpu_sources)',
102 '<@(skgpu_native_gl_sources)', 102 '<@(skgpu_native_gl_sources)',
103 '<@(skgpu_angle_gl_sources)', 103 '<@(skgpu_angle_gl_sources)',
104 '<@(skgpu_mesa_gl_sources)', 104 '<@(skgpu_mesa_gl_sources)',
105 '<@(skgpu_debug_gl_sources)', 105 '<@(skgpu_debug_gl_sources)',
106 '<@(skgpu_null_gl_sources)', 106 '<@(skgpu_null_gl_sources)',
107 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the bui ld). 107 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the bui ld).
108 ], 108 ],
109 'conditions': [ 109 'conditions': [
110 [ 'skia_nv_path_rendering', {
111 'defines': [
112 'GR_GL_USE_NV_PATH_RENDERING=1',
113 ],
114 }],
110 [ 'skia_stroke_path_rendering', { 115 [ 'skia_stroke_path_rendering', {
111 'sources': [ 116 'sources': [
112 '../experimental/StrokePathRenderer/GrStrokePathRenderer.h', 117 '../experimental/StrokePathRenderer/GrStrokePathRenderer.h',
113 '../experimental/StrokePathRenderer/GrStrokePathRenderer.cpp', 118 '../experimental/StrokePathRenderer/GrStrokePathRenderer.cpp',
114 ], 119 ],
115 'defines': [ 120 'defines': [
116 'GR_STROKE_PATH_RENDERING=1', 121 'GR_STROKE_PATH_RENDERING=1',
117 ], 122 ],
118 }], 123 }],
119 [ 'skia_android_path_rendering', { 124 [ 'skia_android_path_rendering', {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'libraries': [ 233 'libraries': [
229 '-lGLESv2', 234 '-lGLESv2',
230 '-lEGL', 235 '-lEGL',
231 ], 236 ],
232 }, 237 },
233 }], 238 }],
234 ], 239 ],
235 }, 240 },
236 ], 241 ],
237 } 242 }
OLDNEW
« no previous file with comments | « gyp/common_variables.gypi ('k') | include/gpu/GrContextFactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698