diff options
author | egdaniel <egdaniel@google.com> | 2016-02-22 06:17:52 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-22 06:17:53 -0800 |
commit | ad3a13c4c34d300882b8f9a5fdb98ad34a9df55b (patch) | |
tree | 81916dad8832c11247a1ed0686bfb210a9c113bd /gyp/gpuVk.gyp | |
parent | 48cf268defad66f58f1aa03b4835e5583be96b2f (diff) |
Revert of Add vulkan files into skia repo. (patchset #2 id:20001 of https://codereview.chromium.org/1718693002/ )
Reason for revert:
breaking builds
Original issue's description:
> Add vulkan files into skia repo. This is an incomplete backend with only partial functionality at this time.
>
> R=robertphillips@google.com
> TBR=bsalomon@google.com
>
> BUG=skia:4955
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718693002
>
> Committed: https://skia.googlesource.com/skia/+/48cf268defad66f58f1aa03b4835e5583be96b2f
TBR=robertphillips@google.com,bsalomon@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4955
Review URL: https://codereview.chromium.org/1723503002
Diffstat (limited to 'gyp/gpuVk.gyp')
-rw-r--r-- | gyp/gpuVk.gyp | 202 |
1 files changed, 0 insertions, 202 deletions
diff --git a/gyp/gpuVk.gyp b/gyp/gpuVk.gyp deleted file mode 100644 index 6f57441513..0000000000 --- a/gyp/gpuVk.gyp +++ /dev/null @@ -1,202 +0,0 @@ -# -# Copyright 2015 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -# - -# GYP for building gpu -{ - 'variables': { - 'variables': - { - 'vulkan_merged_into_skia%': '0', - }, - 'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)', - 'conditions' : [ - [ 'vulkan_merged_into_skia == 1', { - 'skia_gyp_path%': '../gyp', - 'skia_root_path%': '../', - 'vulkan_third_party_path%': '..\\third_party', - }, { - 'skia_gyp_path%': '../skia/gyp', - 'skia_root_path%': '../skia', - 'vulkan_third_party_path%': '..\\..\\third_party', - }], - ], - }, - 'target_defaults': { - 'defines': [ - 'VK_PROTOTYPES', - ], - 'conditions': [ - ['skia_os == "win"', { - 'all_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'vulkan-1.lib', - 'shaderc.lib', - 'shaderc_util.lib', - 'glslang.lib', - 'OSDependent.lib', - 'OGLCompiler.lib', - 'SPIRV-Tools.lib', - 'SPIRV.lib', - ], - }, - }, - }, - 'link_settings': { - 'configurations': { - 'Debug': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalLibraryDirectories': [ - '<(vulkan_third_party_path)\\vulkan\\', - '<(vulkan_third_party_path)\\shaderc\\Debug\\', - ], - }, - }, - }, - 'Release': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalLibraryDirectories': [ - '<(vulkan_third_party_path)\\vulkan\\', - '<(vulkan_third_party_path)\\shaderc\\Release\\', - ], - }, - }, - }, - 'Debug_x64': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalLibraryDirectories': [ - '<(vulkan_third_party_path)\\vulkan\\', - '<(vulkan_third_party_path)\\shaderc\\Debug\\', - ], - }, - }, - }, - 'Release_x64': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalLibraryDirectories': [ - '<(vulkan_third_party_path)\\vulkan\\', - '<(vulkan_third_party_path)\\shaderc\\Release\\', - ], - }, - }, - }, - }, - }, - }], - ['skia_os != "win"', { - 'sources/': [ ['exclude', '_win.(h|cpp)$'], - ], - }], - ['skia_os != "mac"', { - 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'], - ], - }], - ['skia_os != "linux" and skia_os != "chromeos"', { - 'sources/': [ ['exclude', '_glx.(h|cpp)$'], - ], - }], - ['skia_os != "ios"', { - 'sources/': [ ['exclude', '_iOS.(h|cpp|m|mm)$'], - ], - }], - ['skia_os != "android"', { - 'sources/': [ ['exclude', '_android.(h|cpp)$'], - ], - }], - ['skia_os != "nacl"', { - 'sources/': [ ['exclude', '_nacl.(h|cpp)$'], - ], - }], - ['skia_os == "nacl" or skia_egl == 0', { - 'sources/': [ ['exclude', '_egl.(h|cpp)$'], - ], - }], - ['skia_os == "android"', { - 'sources/': [ ['exclude', 'GrGLCreateNativeInterface_egl.cpp'], - ], - }], - ['skia_egl == 1', { - 'sources/': [ ['exclude', '_glx.(h|cpp)$'], - ], - }], - # nullify the targets in this gyp file if skia_gpu is 0 - [ 'skia_gpu == 0', { - 'sources/': [ - ['exclude', '.*'], - ], - 'defines/': [ - ['exclude', '.*'], - ], - 'include_dirs/': [ - ['exclude', '.*'], - ], - 'link_settings': { - 'libraries/': [ - ['exclude', '.*'], - ], - }, - 'direct_dependent_settings': { - 'defines/': [ - ['exclude', '.*'], - ], - 'include_dirs/': [ - ['exclude', '.*'], - ], - }, - }], - ], - 'direct_dependent_settings': { - 'conditions': [ - [ 'skia_os == "win"', { - 'defines': [ - 'GR_GL_FUNCTION_TYPE=__stdcall', - ], - }], - ], - 'include_dirs': [ - '../include/gpu', - '../third_party/' - ], - }, - }, - 'targets': [ - { - 'target_name': 'skgpu_vk', - 'product_name': 'skia_skgpu_vk', - 'type': 'static_library', - 'standalone_static_library': 1, - 'dependencies': [ - '<(skia_gyp_path)/core.gyp:*', - '<(skia_gyp_path)/utils.gyp:utils', - '<(skia_gyp_path)/etc1.gyp:libetc1', - '<(skia_gyp_path)/ktx.gyp:libSkKTX', - ], - 'includes': [ - 'gpuVk.gypi', - ], - 'include_dirs': [ - '../include/gpu', - '../src/gpu', - '../third_party', - '<(skia_root_path)/include/gpu', - '<(skia_root_path)/include/private', - '<(skia_root_path)/src/core', - '<(skia_root_path)/src/gpu', - '<(skia_root_path)/src/image/', - ], - 'sources': [ - '<@(skgpu_vk_sources)', - 'gpuVk.gypi', # Makes the gypi appear in IDEs (but does not modify the build). - ], - }, - ], -} |