diff options
Diffstat (limited to 'ui/surface/surface.gyp')
-rw-r--r-- | ui/surface/surface.gyp | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp index 868e599..f58f05d 100644 --- a/ui/surface/surface.gyp +++ b/ui/surface/surface.gyp @@ -14,41 +14,6 @@ '<(DEPTH)/third_party/khronos', ], }], - # TODO(ncarter): Does hlsl compilation belong in a shared location? - ['OS == "win"', { - 'include_dirs': [ - '<(INTERMEDIATE_DIR)/hlsl', - ], - 'rules': [ - { - 'variables': { - 'fxc': '<(windows_sdk_path)/bin/x86/fxc.exe', - 'h_file': '<(INTERMEDIATE_DIR)/hlsl/<(RULE_INPUT_ROOT)_hlsl_compiled.h', - 'cc_file': '<(INTERMEDIATE_DIR)/hlsl/<(RULE_INPUT_ROOT)_hlsl_compiled.cc', - }, - 'rule_name': 'compile_hlsl', - 'extension': 'hlsl', - 'inputs': [ - '<(fxc)', - 'compile_hlsl.py' - ], - 'outputs': [ - '<(h_file)', - '<(cc_file)', - ], - 'action': [ - 'python', - 'compile_hlsl.py', - '--shader_compiler_tool', '<(fxc)', - '--output_h_file', '<(h_file)', - '--output_cc_file', '<(cc_file)', - '--input_hlsl_file', '<(RULE_INPUT_PATH)', - ], - 'message': 'Generating shaders from <(RULE_INPUT_PATH)', - 'process_outputs_as_sources': 1, - }, - ], - }], ], }, 'targets': [ @@ -69,16 +34,7 @@ 'sources': [ 'accelerated_surface_mac.cc', 'accelerated_surface_mac.h', - 'accelerated_surface_transformer_win.cc', - 'accelerated_surface_transformer_win.h', - 'accelerated_surface_transformer_win.hlsl', - 'accelerated_surface_win.cc', - 'accelerated_surface_win.h', - 'd3d9_utils_win.cc', - 'd3d9_utils_win.h', 'surface_export.h', - 'surface_switches.h', - 'surface_switches.cc', 'transport_dib.h', 'transport_dib.cc', 'transport_dib_gtk.cc', @@ -90,29 +46,4 @@ ], }, ], - 'conditions': [ - ['OS == "win"', { - 'targets': [ - { - 'target_name': 'surface_gpu_tests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/base/base.gyp:run_all_unittests', - '<(DEPTH)/media/media.gyp:media', - '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/ui/events/events.gyp:events_base', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', - '<(DEPTH)/ui/ui.gyp:ui', - 'surface', - ], - 'sources': [ - 'accelerated_surface_transformer_win_unittest.cc', - ], - }, - ], - }], - ], } |