AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
f54445e937
skia2/include/gpu/vk/GrVkVulkan.h

33 lines
923 B
C
Raw Normal View History

Don't include system vulkan header when building skia files. With this change clients will still have to have vulkan/vulkan_core.h on their include path when compiling files that include Skia. However, it will not be required when compiling Skia files. Bug: skia: Change-Id: I1cd75f4f18d3097c8a1606c3e8a51a371b01b565 Reviewed-on: https://skia-review.googlesource.com/c/179560 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-12-20 19:09:36 +00:00
/*
* Copyright 2018 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef GrVkVulkan_DEFINED
#define GrVkVulkan_DEFINED
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "include/core/SkTypes.h"
Don't include system vulkan header when building skia files. With this change clients will still have to have vulkan/vulkan_core.h on their include path when compiling files that include Skia. However, it will not be required when compiling Skia files. Bug: skia: Change-Id: I1cd75f4f18d3097c8a1606c3e8a51a371b01b565 Reviewed-on: https://skia-review.googlesource.com/c/179560 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-12-20 19:09:36 +00:00
#if SKIA_IMPLEMENTATION || !defined(SK_VULKAN)
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "include/third_party/vulkan/vulkan/vulkan_core.h"
Don't include system vulkan header when building skia files. With this change clients will still have to have vulkan/vulkan_core.h on their include path when compiling files that include Skia. However, it will not be required when compiling Skia files. Bug: skia: Change-Id: I1cd75f4f18d3097c8a1606c3e8a51a371b01b565 Reviewed-on: https://skia-review.googlesource.com/c/179560 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-12-20 19:09:36 +00:00
#else
// For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
// headers stay up to date for our needs
#include <vulkan/vulkan_core.h>
#endif
#ifdef SK_BUILD_FOR_ANDROID
// This is needed to get android extensions for external memory
#if SKIA_IMPLEMENTATION || !defined(SK_VULKAN)
rewrite includes to not need so much -Ifoo Current strategy: everything from the top Things to look at first are the manual changes: - added tools/rewrite_includes.py - removed -Idirectives from BUILD.gn - various compile.sh simplifications - tweak tools/embed_resources.py - update gn/find_headers.py to write paths from the top - update gn/gn_to_bp.py SkUserConfig.h layout so that #include "include/config/SkUserConfig.h" always gets the header we want. No-Presubmit: true Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-04-23 17:05:21 +00:00
#include "include/third_party/vulkan/vulkan/vulkan_android.h"
Don't include system vulkan header when building skia files. With this change clients will still have to have vulkan/vulkan_core.h on their include path when compiling files that include Skia. However, it will not be required when compiling Skia files. Bug: skia: Change-Id: I1cd75f4f18d3097c8a1606c3e8a51a371b01b565 Reviewed-on: https://skia-review.googlesource.com/c/179560 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-12-20 19:09:36 +00:00
#else
// For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
// headers stay up to date for our needs
#include <vulkan/vulkan_android.h>
#endif
#endif
#endif
Reference in New Issue Copy Permalink