Skip to content

S
swiftshader
Commit a68a80a4 by Alexis Hetu Committed by Alexis Hétu
Options

Vulkan header update

Update Vulkan headers to ToT Includes VK_EXT_line_rasterization Bug: b/139800520 Change-Id: I054c32a29bc740679b4286818e2bac70701ef07c Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/37408 Presubmit-Ready: Alexis Hétu <sugoi@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 6652f0b6
Showing with 71 additions and 52 deletions
include/vulkan/vk_icd.h
...@@ -89,7 +89,8 @@ typedef enum { ...@@ -89,7 +89,8 @@ typedef enum {
VK_ICD_WSI_PLATFORM_MACOS, VK_ICD_WSI_PLATFORM_MACOS,
VK_ICD_WSI_PLATFORM_IOS, VK_ICD_WSI_PLATFORM_IOS,
VK_ICD_WSI_PLATFORM_DISPLAY, VK_ICD_WSI_PLATFORM_DISPLAY,
VK_ICD_WSI_PLATFORM_HEADLESS VK_ICD_WSI_PLATFORM_HEADLESS,
VK_ICD_WSI_PLATFORM_METAL,
} VkIcdWsiPlatform; } VkIcdWsiPlatform;
typedef struct { typedef struct {
...@@ -172,4 +173,11 @@ typedef struct { ...@@ -172,4 +173,11 @@ typedef struct {
VkIcdSurfaceBase base; VkIcdSurfaceBase base;
} VkIcdSurfaceHeadless; } VkIcdSurfaceHeadless;
#ifdef VK_USE_PLATFORM_METAL_EXT
typedef struct {
VkIcdSurfaceBase base;
const CAMetalLayer *pLayer;
} VkIcdSurfaceMetal;
#endif // VK_USE_PLATFORM_METAL_EXT
#endif // VKICD_H #endif // VKICD_H
include/vulkan/vulkan.h
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA #ifdef VK_USE_PLATFORM_FUCHSIA
#include <zircon/types.h> #include <zircon/types.h>
#include "vulkan_fuchsia.h" #include "vulkan_fuchsia.h"
#include "vulkan_fuchsia_extras.h"
#endif #endif
#ifdef VK_USE_PLATFORM_IOS_MVK #ifdef VK_USE_PLATFORM_IOS_MVK
......
include/vulkan/vulkan.hpp
This source diff could not be displayed because it is too large. You can view the blob instead.
include/vulkan/vulkan_android.h
#ifndef VULKAN_ANDROID_H_ #ifndef VULKAN_ANDROID_H_
#define VULKAN_ANDROID_H_ 1 #define VULKAN_ANDROID_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_KHR_android_surface 1 #define VK_KHR_android_surface 1
struct ANativeWindow; struct ANativeWindow;
......
include/vulkan/vulkan_fuchsia.h
#ifndef VULKAN_FUCHSIA_H_ #ifndef VULKAN_FUCHSIA_H_
#define VULKAN_FUCHSIA_H_ 1 #define VULKAN_FUCHSIA_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_FUCHSIA_imagepipe_surface 1 #define VK_FUCHSIA_imagepipe_surface 1
#define VK_FUCHSIA_IMAGEPIPE_SURFACE_SPEC_VERSION 1 #define VK_FUCHSIA_IMAGEPIPE_SURFACE_SPEC_VERSION 1
......
include/vulkan/vulkan_ggp.h
#ifndef VULKAN_GGP_H_ #ifndef VULKAN_GGP_H_
#define VULKAN_GGP_H_ 1 #define VULKAN_GGP_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_GGP_stream_descriptor_surface 1 #define VK_GGP_stream_descriptor_surface 1
#define VK_GGP_STREAM_DESCRIPTOR_SURFACE_SPEC_VERSION 1 #define VK_GGP_STREAM_DESCRIPTOR_SURFACE_SPEC_VERSION 1
......
include/vulkan/vulkan_ios.h
#ifndef VULKAN_IOS_H_ #ifndef VULKAN_IOS_H_
#define VULKAN_IOS_H_ 1 #define VULKAN_IOS_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_MVK_ios_surface 1 #define VK_MVK_ios_surface 1
#define VK_MVK_IOS_SURFACE_SPEC_VERSION 2 #define VK_MVK_IOS_SURFACE_SPEC_VERSION 2
......
include/vulkan/vulkan_macos.h
#ifndef VULKAN_MACOS_H_ #ifndef VULKAN_MACOS_H_
#define VULKAN_MACOS_H_ 1 #define VULKAN_MACOS_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_MVK_macos_surface 1 #define VK_MVK_macos_surface 1
#define VK_MVK_MACOS_SURFACE_SPEC_VERSION 2 #define VK_MVK_MACOS_SURFACE_SPEC_VERSION 2
......
include/vulkan/vulkan_metal.h
#ifndef VULKAN_METAL_H_ #ifndef VULKAN_METAL_H_
#define VULKAN_METAL_H_ 1 #define VULKAN_METAL_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_EXT_metal_surface 1 #define VK_EXT_metal_surface 1
......
include/vulkan/vulkan_vi.h
#ifndef VULKAN_VI_H_ #ifndef VULKAN_VI_H_
#define VULKAN_VI_H_ 1 #define VULKAN_VI_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_NN_vi_surface 1 #define VK_NN_vi_surface 1
#define VK_NN_VI_SURFACE_SPEC_VERSION 1 #define VK_NN_VI_SURFACE_SPEC_VERSION 1
......
include/vulkan/vulkan_wayland.h
#ifndef VULKAN_WAYLAND_H_ #ifndef VULKAN_WAYLAND_H_
#define VULKAN_WAYLAND_H_ 1 #define VULKAN_WAYLAND_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_KHR_wayland_surface 1 #define VK_KHR_wayland_surface 1
#define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6 #define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6
......
include/vulkan/vulkan_win32.h
#ifndef VULKAN_WIN32_H_ #ifndef VULKAN_WIN32_H_
#define VULKAN_WIN32_H_ 1 #define VULKAN_WIN32_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_KHR_win32_surface 1 #define VK_KHR_win32_surface 1
#define VK_KHR_WIN32_SURFACE_SPEC_VERSION 6 #define VK_KHR_WIN32_SURFACE_SPEC_VERSION 6
...@@ -246,7 +247,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandleNV( ...@@ -246,7 +247,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryWin32HandleNV(
#define VK_NV_win32_keyed_mutex 1 #define VK_NV_win32_keyed_mutex 1
#define VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION 1 #define VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION 2
#define VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME "VK_NV_win32_keyed_mutex" #define VK_NV_WIN32_KEYED_MUTEX_EXTENSION_NAME "VK_NV_win32_keyed_mutex"
typedef struct VkWin32KeyedMutexAcquireReleaseInfoNV { typedef struct VkWin32KeyedMutexAcquireReleaseInfoNV {
VkStructureType sType; VkStructureType sType;
...@@ -263,7 +264,7 @@ typedef struct VkWin32KeyedMutexAcquireReleaseInfoNV { ...@@ -263,7 +264,7 @@ typedef struct VkWin32KeyedMutexAcquireReleaseInfoNV {
#define VK_EXT_full_screen_exclusive 1 #define VK_EXT_full_screen_exclusive 1
#define VK_EXT_FULL_SCREEN_EXCLUSIVE_SPEC_VERSION 3 #define VK_EXT_FULL_SCREEN_EXCLUSIVE_SPEC_VERSION 4
#define VK_EXT_FULL_SCREEN_EXCLUSIVE_EXTENSION_NAME "VK_EXT_full_screen_exclusive" #define VK_EXT_FULL_SCREEN_EXCLUSIVE_EXTENSION_NAME "VK_EXT_full_screen_exclusive"
typedef enum VkFullScreenExclusiveEXT { typedef enum VkFullScreenExclusiveEXT {
......
include/vulkan/vulkan_xcb.h
#ifndef VULKAN_XCB_H_ #ifndef VULKAN_XCB_H_
#define VULKAN_XCB_H_ 1 #define VULKAN_XCB_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_KHR_xcb_surface 1 #define VK_KHR_xcb_surface 1
#define VK_KHR_XCB_SURFACE_SPEC_VERSION 6 #define VK_KHR_XCB_SURFACE_SPEC_VERSION 6
......
include/vulkan/vulkan_xlib.h
#ifndef VULKAN_XLIB_H_ #ifndef VULKAN_XLIB_H_
#define VULKAN_XLIB_H_ 1 #define VULKAN_XLIB_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_KHR_xlib_surface 1 #define VK_KHR_xlib_surface 1
#define VK_KHR_XLIB_SURFACE_SPEC_VERSION 6 #define VK_KHR_XLIB_SURFACE_SPEC_VERSION 6
......
include/vulkan/vulkan_xlib_xrandr.h
#ifndef VULKAN_XLIB_XRANDR_H_ #ifndef VULKAN_XLIB_XRANDR_H_
#define VULKAN_XLIB_XRANDR_H_ 1 #define VULKAN_XLIB_XRANDR_H_ 1
#ifdef __cplusplus
extern "C" {
#endif
/* /*
** Copyright (c) 2015-2019 The Khronos Group Inc. ** Copyright (c) 2015-2019 The Khronos Group Inc.
** **
...@@ -27,6 +23,11 @@ extern "C" { ...@@ -27,6 +23,11 @@ extern "C" {
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define VK_EXT_acquire_xlib_display 1 #define VK_EXT_acquire_xlib_display 1
#define VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION 1 #define VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment