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

Unified Diff: gpu/gpu.gyp

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/gpu_info_collector_win.cc ('k') | gpu/perftests/run_all_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 752a9605f0ea059b4a7f364799fd3d71d3a3abf5..138d858a0189d2d88741ab74d29520e8f4055e77 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -179,7 +179,6 @@
'command_buffer/client/gles2_implementation_unittest.cc',
'command_buffer/client/mapped_memory_unittest.cc',
'command_buffer/client/query_tracker_unittest.cc',
- 'command_buffer/client/program_info_manager_unittest.cc',
'command_buffer/client/ring_buffer_test.cc',
'command_buffer/client/transfer_buffer_unittest.cc',
'command_buffer/client/vertex_array_object_manager_unittest.cc',
@@ -281,6 +280,23 @@
'msvs_disabled_warnings': [ 4267, ],
},
{
+ # GN version: //gpu/gpu_perftests
+ 'target_name': 'gpu_perftests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../testing/gtest.gyp:gtest',
+ '../testing/perf/perf_test.gyp:perf_test',
+ '../ui/gfx/gfx.gyp:gfx_geometry',
+ '../ui/gl/gl.gyp:gl',
+ ],
+ 'sources': [
+ 'perftests/run_all_tests.cc',
+ 'perftests/texture_upload_perftest.cc',
+ ],
+ },
+ {
# GN version: //gpu:gl_tests
'target_name': 'gl_tests',
'type': '<(gtest_target_type)',
« no previous file with comments | « gpu/config/gpu_info_collector_win.cc ('k') | gpu/perftests/run_all_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698