AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9679612d6b
skia2/tools/gpu/vk/GrVulkanDefines.h

44 lines
1.1 KiB
C
Raw Normal View History

Revert "Revert "Add define to use customize vulkan header."" This reverts commit b351817588baf94ac725e35f10ee1d5ff8178834. Reason for revert: Relanding with android fixes Original change's description: > Revert "Add define to use customize vulkan header." > > This reverts commit a492eb0e1f08311bfa47f46c660144e7bc8a6c0e. > > Reason for revert: Breaking Android roll (b/c builds tools?) > > Original change's description: > > Add define to use customize vulkan header. > > > > Bug: skia: > > Change-Id: Ia87c81a54603a02b2f8f51a735bf173a49afe6c7 > > Reviewed-on: https://skia-review.googlesource.com/81121 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: I80a685bf88af909865f274ffc61686be57e8c313 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/81740 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ia701e884bfa3799dc73002f892feb2ecafe9da12 Reviewed-on: https://skia-review.googlesource.com/81742 Reviewed-by: Derek Sollenberger <djsollen@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-12-07 17:48:30 +00:00
/*
* Copyright 2017 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef GrVulkanDefines_DEFINED
#define GrVulkanDefines_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"
Revert "Revert "IWYU for tests starting with 'D'."" This reverts commit edf8449d2c3663350b6b6e30d2fa4c70da02deef. Change-Id: Ibeedd9965855b3ccfe44486d15307bf3da15fd9c Reviewed-on: https://skia-review.googlesource.com/129516 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-22 14:48:08 +00:00
Use our own checked in Vulkan header to build skia source code. Core Skia will always include our own SkiaVulkan.h which basically just includes vulkan_core.h. All platform vulkan specific stuff must be include by the client in their own vulkan.h file. Our public interface is set up that we only use vulkan objects that will be present in all versions of vulkan headers that the client could include. Bug: skia: Change-Id: I6673fd91498eabcc923d65d20f2b5e0a89b4ccf6 Reviewed-on: https://skia-review.googlesource.com/142985 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-08-01 13:23:57 +00:00
#if defined(SK_BUILD_FOR_WIN)
# if !defined(VK_USE_PLATFORM_WIN32_KHR)
# define VK_USE_PLATFORM_WIN32_KHR
# endif
#elif defined(SK_BUILD_FOR_ANDROID)
# if !defined(VK_USE_PLATFORM_ANDROID_KHR)
# define VK_USE_PLATFORM_ANDROID_KHR
# endif
#elif defined(SK_BUILD_FOR_UNIX)
SKQP Build for Fuchsia SDK Change-Id: I2619784eca0f7a4dd66f2db0104cb746d9266b4e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244369 Commit-Queue: John Rosasco <rosasco@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2019-09-25 21:14:35 +00:00
# if !defined(__Fuchsia__) && !defined(VK_USE_PLATFORM_XCB_KHR)
Use our own checked in Vulkan header to build skia source code. Core Skia will always include our own SkiaVulkan.h which basically just includes vulkan_core.h. All platform vulkan specific stuff must be include by the client in their own vulkan.h file. Our public interface is set up that we only use vulkan objects that will be present in all versions of vulkan headers that the client could include. Bug: skia: Change-Id: I6673fd91498eabcc923d65d20f2b5e0a89b4ccf6 Reviewed-on: https://skia-review.googlesource.com/142985 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-08-01 13:23:57 +00:00
# define VK_USE_PLATFORM_XCB_KHR
# endif
#elif defined(SK_BUILD_FOR_MAC)
# if !defined(VK_USE_PLATFORM_MACOS_MVK)
# define VK_USE_PLATFORM_MACOS_MVK
# endif
#elif defined(SK_BUILD_FOR_IOS)
# if !defined(VK_USE_PLATFORM_IOS_MVK)
# define VK_USE_PLATFORM_IOS_MVK
# endif
#endif
// We create our own function table and never directly call any functions via vk*(). So no
Revert "Revert "Revert "Revert "Don't build GL on Metal, Vulkan, Dawn, Direct3D bots"""" Updated to use sentinel GL context even when GL backend is not built. This reverts commit 1171d314efc7e131b039c94126d26575cfb9e70c. Change-Id: Ia94bbe4865ddd4e898446c13886877c539f0eb0b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/277976 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2020-03-19 19:54:28 +00:00
// need to include the prototype functions.
#if !defined(VK_NO_PROTOTYPES)
Use our own checked in Vulkan header to build skia source code. Core Skia will always include our own SkiaVulkan.h which basically just includes vulkan_core.h. All platform vulkan specific stuff must be include by the client in their own vulkan.h file. Our public interface is set up that we only use vulkan objects that will be present in all versions of vulkan headers that the client could include. Bug: skia: Change-Id: I6673fd91498eabcc923d65d20f2b5e0a89b4ccf6 Reviewed-on: https://skia-review.googlesource.com/142985 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-08-01 13:23:57 +00:00
#define VK_NO_PROTOTYPES
#endif
Revert "Revert "Add define to use customize vulkan header."" This reverts commit b351817588baf94ac725e35f10ee1d5ff8178834. Reason for revert: Relanding with android fixes Original change's description: > Revert "Add define to use customize vulkan header." > > This reverts commit a492eb0e1f08311bfa47f46c660144e7bc8a6c0e. > > Reason for revert: Breaking Android roll (b/c builds tools?) > > Original change's description: > > Add define to use customize vulkan header. > > > > Bug: skia: > > Change-Id: Ia87c81a54603a02b2f8f51a735bf173a49afe6c7 > > Reviewed-on: https://skia-review.googlesource.com/81121 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: I80a685bf88af909865f274ffc61686be57e8c313 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/81740 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ia701e884bfa3799dc73002f892feb2ecafe9da12 Reviewed-on: https://skia-review.googlesource.com/81742 Reviewed-by: Derek Sollenberger <djsollen@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-12-07 17:48:30 +00:00
Use our own checked in Vulkan header to build skia source code. Core Skia will always include our own SkiaVulkan.h which basically just includes vulkan_core.h. All platform vulkan specific stuff must be include by the client in their own vulkan.h file. Our public interface is set up that we only use vulkan objects that will be present in all versions of vulkan headers that the client could include. Bug: skia: Change-Id: I6673fd91498eabcc923d65d20f2b5e0a89b4ccf6 Reviewed-on: https://skia-review.googlesource.com/142985 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-08-01 13:23:57 +00:00
#include <vulkan/vulkan.h> // IWYU pragma: export
Revert "Revert "Add define to use customize vulkan header."" This reverts commit b351817588baf94ac725e35f10ee1d5ff8178834. Reason for revert: Relanding with android fixes Original change's description: > Revert "Add define to use customize vulkan header." > > This reverts commit a492eb0e1f08311bfa47f46c660144e7bc8a6c0e. > > Reason for revert: Breaking Android roll (b/c builds tools?) > > Original change's description: > > Add define to use customize vulkan header. > > > > Bug: skia: > > Change-Id: Ia87c81a54603a02b2f8f51a735bf173a49afe6c7 > > Reviewed-on: https://skia-review.googlesource.com/81121 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: I80a685bf88af909865f274ffc61686be57e8c313 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/81740 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ia701e884bfa3799dc73002f892feb2ecafe9da12 Reviewed-on: https://skia-review.googlesource.com/81742 Reviewed-by: Derek Sollenberger <djsollen@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-12-07 17:48:30 +00:00
#endif
Reference in New Issue Copy Permalink