Skip to content

Commit

Permalink
Merge #221
Browse files Browse the repository at this point in the history
221: Support VK_KHR_portability_subset r=kvark a=kvark

Our extension IDs were messed up. Good thing to clean them up now, since otherwise nobody would be able to make this work 😅 
Also, the test native example is now fully trying to initialize the portability extension and gather the relevant info. Output on my machine:
```
	vkEnumerateInstanceExtensionProperties: res=0 count=5
	vkEnumeratePhysicalDevices: res=0 count=1
	vkEnumerateDeviceExtensionProperties: res=0 count=3
	gfxGetPhysicalDeviceProperties2KHR
		minVertexInputBindingStrideAlignment = 4
	gfxGetPhysicalDeviceFeatures2KHR
		events = 1
		pointPolygons = 0
		separateStencilMaskRef = 1
		triangleFans = 0
```

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
  • Loading branch information
bors[bot] and kvark authored Sep 20, 2020
2 parents a81b5a4 + 46e35f8 commit e109587
Show file tree
Hide file tree
Showing 24 changed files with 6,008 additions and 3,307 deletions.
7 changes: 7 additions & 0 deletions .monocodus
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
rust:
formatter:
- name: rustfmt
repo_checkers:
- name: rust-clippy

c:
85 changes: 44 additions & 41 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 2 additions & 12 deletions headers/vulkan/vk_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,9 @@
// File: vk_platform.h
//
/*
** Copyright (c) 2014-2017 The Khronos Group Inc.
** Copyright (c) 2014-2020 The Khronos Group Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
** SPDX-License-Identifier: Apache-2.0
*/


Expand Down
34 changes: 22 additions & 12 deletions headers/vulkan/vulkan.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,9 @@
#define VULKAN_H_ 1

/*
** Copyright (c) 2015-2019 The Khronos Group Inc.
** Copyright (c) 2015-2020 The Khronos Group Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
** SPDX-License-Identifier: Apache-2.0
*/

#include "vk_platform.h"
Expand All @@ -38,6 +28,9 @@
#include "vulkan_macos.h"
#endif

#ifdef VK_USE_PLATFORM_METAL_EXT
#include "vulkan_metal.h"
#endif

#ifdef VK_USE_PLATFORM_VI_NN
#include "vulkan_vi.h"
Expand Down Expand Up @@ -68,10 +61,27 @@
#endif


#ifdef VK_USE_PLATFORM_DIRECTFB_EXT
#include <directfb.h>
#include "vulkan_directfb.h"
#endif


#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
#include "vulkan_xlib_xrandr.h"
#endif


#ifdef VK_USE_PLATFORM_GGP
#include <ggp_c/vulkan_types.h>
#include "vulkan_ggp.h"
#endif


#ifdef VK_ENABLE_BETA_EXTENSIONS
#include "vulkan_beta.h"
#endif

#endif // VULKAN_H_
Loading

0 comments on commit e109587

Please sign in to comment.