Skip to content

Commit

Permalink
Merge branch 'SaschaWillems:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
richard-lunarg authored Mar 15, 2024
2 parents a333d31 + 2b374f4 commit 2b28933
Show file tree
Hide file tree
Showing 11 changed files with 17,636 additions and 8,827 deletions.
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,22 @@ The hardware reports can be submitted to a public [online database](http://vulka
The repository includes a project file for the [Qt Creator IDE](https://www.qt.io/ide/) that has been tested to work with Windows, Linux and Android. This is the preferred (and easiest) way of building the application if you want to build it yourself. Using the [Qt Visual Studio Tools](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019), it's also possible to use a current Visual Studio version.
Alternatively, you can simply run `qmake` followed by `make` in the source directory.

## Linux
When building for Linux, specify the desired windowing system to enable its support.

X11 support
```
qmake5 -config release DEFINES+=X11
```

Wayland support
```
qmake5 -config release DEFINES+=WAYLAND
```

Note: Do not enable both flags simultaneously.


# Releases
Current releases for all platforms will be provided on a regular basis at [vulkan.gpuinfo.org/download.php](https://vulkan.gpuinfo.org/download.php).

Expand Down
2 changes: 1 addition & 1 deletion Vulkan-Headers
Submodule Vulkan-Headers updated 62 files
+10 −58 .github/workflows/ci.yml
+4 −4 .reuse/dep5
+2 −0 BUILD.gn
+1 −0 CMakeLists.txt
+392 −0 include/vk_video/vulkan_video_codec_av1std.h
+109 −0 include/vk_video/vulkan_video_codec_av1std_decode.h
+1 −1 include/vk_video/vulkan_video_codec_h264std.h
+1 −1 include/vk_video/vulkan_video_codec_h264std_decode.h
+4 −4 include/vk_video/vulkan_video_codec_h264std_encode.h
+1 −1 include/vk_video/vulkan_video_codec_h265std.h
+1 −1 include/vk_video/vulkan_video_codec_h265std_decode.h
+4 −4 include/vk_video/vulkan_video_codec_h265std_encode.h
+1 −1 include/vk_video/vulkan_video_codecs_common.h
+1 −1 include/vulkan/vk_platform.h
+1,849 −249 include/vulkan/vulkan.cppm
+1 −1 include/vulkan/vulkan.h
+4,378 −1,282 include/vulkan/vulkan.hpp
+1 −1 include/vulkan/vulkan_android.h
+1 −598 include/vulkan/vulkan_beta.h
+1,344 −266 include/vulkan/vulkan_core.h
+1 −1 include/vulkan/vulkan_directfb.h
+502 −495 include/vulkan/vulkan_enums.hpp
+2,143 −816 include/vulkan/vulkan_extension_inspection.hpp
+2 −1 include/vulkan/vulkan_format_traits.hpp
+1 −1 include/vulkan/vulkan_fuchsia.h
+5,594 −2,534 include/vulkan/vulkan_funcs.hpp
+1 −1 include/vulkan/vulkan_ggp.h
+845 −454 include/vulkan/vulkan_handles.hpp
+976 −445 include/vulkan/vulkan_hash.hpp
+29 −2 include/vulkan/vulkan_hpp_macros.hpp
+1 −1 include/vulkan/vulkan_ios.h
+1 −1 include/vulkan/vulkan_macos.h
+1 −1 include/vulkan/vulkan_metal.h
+4,597 −2,874 include/vulkan/vulkan_raii.hpp
+1 −1 include/vulkan/vulkan_screen.h
+91 −2 include/vulkan/vulkan_shared.hpp
+518 −206 include/vulkan/vulkan_static_assertions.hpp
+9,236 −3,964 include/vulkan/vulkan_structs.hpp
+360 −325 include/vulkan/vulkan_to_string.hpp
+1 −1 include/vulkan/vulkan_vi.h
+1,018 −1 include/vulkan/vulkan_video.hpp
+1 −1 include/vulkan/vulkan_wayland.h
+1 −1 include/vulkan/vulkan_win32.h
+1 −1 include/vulkan/vulkan_xcb.h
+1 −1 include/vulkan/vulkan_xlib.h
+1 −1 include/vulkan/vulkan_xlib_xrandr.h
+1 −1 registry/apiconventions.py
+1 −1 registry/cgenerator.py
+3 −4 registry/generator.py
+11 −32 registry/parse_dependency.py
+149 −140 registry/profiles/VP_KHR_roadmap.json
+1 −1 registry/reg.py
+87 −5 registry/spec_tools/conventions.py
+1 −2 registry/spec_tools/util.py
+5,354 −1,923 registry/validusage.json
+494 −9 registry/video.xml
+1,359 −634 registry/vk.xml
+16 −3 registry/vkconventions.py
+25 −38 tests/CMakeLists.txt
+0 −30 tests/add_subdirectory/CMakeLists.txt
+0 −30 tests/find_package/CMakeLists.txt
+73 −0 tests/integration/CMakeLists.txt
226 changes: 226 additions & 0 deletions VulkanDeviceInfoExtensions.cpp

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion VulkanDeviceInfoExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class VulkanDeviceInfoExtensions
void readPhysicalProperties_EXT();
void readPhysicalFeatures_HUAWEI();
void readPhysicalProperties_HUAWEI();
void readPhysicalFeatures_IMG();
void readPhysicalFeatures_INTEL();
void readPhysicalFeatures_KHR();
void readPhysicalProperties_KHR();
Expand All @@ -94,7 +95,7 @@ class VulkanDeviceInfoExtensions
void readPhysicalFeatures_VALVE();

public:
const uint32_t vkHeaderVersion = 269;
const uint32_t vkHeaderVersion = 280;
std::vector<Feature2> features2;
std::vector<Property2> properties2;
std::vector<VkExtensionProperties> extensions;
Expand Down
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="de.saschawillems.vulkancapsviewer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.32" android:versionCode="36" android:installLocation="auto">
<manifest package="de.saschawillems.vulkancapsviewer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.34" android:versionCode="38" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<!-- %%INSERT_PERMISSIONS -->
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ android {

defaultConfig {
resConfig "en"
minSdkVersion = "31"
minSdkVersion = "29"
targetSdkVersion = "33"
}
}
19 changes: 19 additions & 0 deletions extensionlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ARM
VK_ARM_rasterization_order_attachment_access
VK_ARM_shader_core_properties
VK_ARM_scheduling_controls
VK_ARM_render_pass_striped
VK_ARM_shader_core_builtins
EXT
VK_EXT_transform_feedback
Expand Down Expand Up @@ -44,6 +45,7 @@ VK_EXT_host_query_reset
VK_EXT_index_type_uint8
VK_EXT_extended_dynamic_state
VK_EXT_host_image_copy
VK_EXT_map_memory_placed
VK_EXT_shader_atomic_float2
VK_EXT_swapchain_maintenance1
VK_EXT_shader_demote_to_helper_invocation
Expand Down Expand Up @@ -104,6 +106,8 @@ HUAWEI
VK_HUAWEI_subpass_shading
VK_HUAWEI_invocation_mask
VK_HUAWEI_cluster_culling_shader
IMG
VK_IMG_relaxed_line_rasterization
INTEL
VK_INTEL_shader_integer_functions2
KHR
Expand Down Expand Up @@ -137,6 +141,8 @@ VK_KHR_timeline_semaphore
VK_KHR_vulkan_memory_model
VK_KHR_shader_terminate_invocation
VK_KHR_fragment_shading_rate
VK_KHR_dynamic_rendering_local_read
VK_KHR_shader_quad_control
VK_KHR_separate_depth_stencil_layouts
VK_KHR_present_wait
VK_KHR_uniform_buffer_standard_layout
Expand All @@ -151,9 +157,18 @@ VK_KHR_zero_initialize_workgroup_memory
VK_KHR_workgroup_memory_explicit_layout
VK_KHR_ray_tracing_maintenance1
VK_KHR_maintenance4
VK_KHR_shader_subgroup_rotate
VK_KHR_shader_maximal_reconvergence
VK_KHR_maintenance5
VK_KHR_ray_tracing_position_fetch
VK_KHR_cooperative_matrix
VK_KHR_video_maintenance1
VK_KHR_vertex_attribute_divisor
VK_KHR_shader_float_controls2
VK_KHR_index_type_uint8
VK_KHR_line_rasterization
VK_KHR_shader_expect_assume
VK_KHR_maintenance6
MSFT
VK_MSFT_layered_driver
NV
Expand Down Expand Up @@ -186,7 +201,11 @@ VK_NV_linear_color_attachment
VK_NV_optical_flow
VK_NV_ray_tracing_invocation_reorder
VK_NV_extended_sparse_address_space
VK_NV_per_stage_descriptor_set
VK_NV_descriptor_pool_overallocation
VK_NV_raw_access_chains
VK_NV_shader_atomic_float16_vector
VK_NV_ray_tracing_validation
NVX
VK_NVX_multiview_per_view_attributes
QCOM
Expand Down
2 changes: 2 additions & 0 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ void logMessageHandler(QtMsgType type, const QMessageLogContext& context, const
QTextStream textStream(&logFile);
textStream << logMessage << endl;
};
// Suppress compiler warning
(void)context;
}

int main(int argc, char *argv[])
Expand Down
2 changes: 1 addition & 1 deletion vulkanCapsViewer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
TEMPLATE = app
TARGET = vulkanCapsViewer
QT += core network widgets gui
CONFIG += c++11
CONFIG += c++17
#CONFIG += release bad for debugging
DEFINES += QT_DLL QT_NETWORK_LIB QT_WIDGETS_LIB VK_ENABLE_BETA_EXTENSIONS
INCLUDEPATH += ./GeneratedFiles \
Expand Down
Loading

0 comments on commit 2b28933

Please sign in to comment.