Skip to content

Commit

Permalink
Merge pull request #106 from SaschaWillems/vulkan_11_12_features_props
Browse files Browse the repository at this point in the history
Add Core 1.1 and 1.2 features and properties and introcude update mechanism
  • Loading branch information
SaschaWillems authored Jan 10, 2021
2 parents e718e30 + 872023a commit 03d0920
Show file tree
Hide file tree
Showing 20 changed files with 1,976 additions and 991 deletions.
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Vulkan Hardware Capability Viewer

![Vulkan Logo](./images/vulkanlogo.png)
<img src="images/vulkanlogo.png" width="480px">

Client application to display hardware implementation details for GPUs supporting the new [Vulkan(tm)](https://www.khronos.org/vulkan/) API by Khronos.
Client application to display hardware implementation details for GPUs supporting the [Vulkan](https://www.khronos.org/vulkan/) API by Khronos.

The hardware reports can be submitted to a public [online database](http://vulkan.gpuinfo.org/) that allows comparing different devices, browsing available features, extensions, formats, etc.

Expand All @@ -11,20 +11,17 @@ The hardware reports can be submitted to a public [online database](http://vulka
<!-- <img src="images/android_tv.png" height="320px"> -->

# Supported platforms
**A Vulkan compatible driver (or on Android image) is required**
**A Vulkan compatible device is required**
- Windows (x64)
- Linux (x64)
- Android (Including Android TV)
- Mac OS X

# API version
Due to the explicit nature of Vulkan, the API version of the Vulkan driver (or Android image) must fit the API level against which the application was build.

# Building

![Build Project](https://github.com/SaschaWillems/VulkanCapsViewer/workflows/Build%20Project/badge.svg)

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.
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.

# Releases
Expand Down
Binary file modified Resources/vulkan32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/vulkan48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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="2.21" android:versionCode="16" android:installLocation="auto">
<manifest package="de.saschawillems.vulkancapsviewer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.0" android:versionCode="17" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Vulkan Caps Viewer" android:icon="@drawable/icon" android:banner="@drawable/banner">&gt;
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="vulkanCapsViewer" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
Expand Down
Binary file modified images/vulkanlogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified libs/vulkan/vulkan-1.lib
Binary file not shown.
10 changes: 5 additions & 5 deletions submitDialog.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
*
* OpenGL hardware capability viewer and database
* Vulkan hardware capability viewer
*
* Submit report dialog
*
* Copyright (C) 2011-2015 by Sascha Willems (www.saschawillems.de)
* Copyright (C) 2016-2020 by Sascha Willems (www.saschawillems.de)
*
* This code is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Expand All @@ -30,14 +30,14 @@
#include <QSettings>
#include <QDialogButtonBox>

submitDialog::submitDialog(QString submitter)
submitDialog::submitDialog(QString submitter, QString caption)
{
QFormLayout *formLayout = new QFormLayout;

// QDialogBox doesn't appear modal on Android which makes it hard to see
#ifdef ANDROID
QLabel *labelCaption = new QLabel();
labelCaption->setText("Submit report to database");
labelCaption->setText(caption);
formLayout->addRow(labelCaption);
setStyleSheet("QDialog{ border: 2px solid black; border-style: solid; border-radius: 4px; }");
#endif
Expand All @@ -63,7 +63,7 @@ submitDialog::submitDialog(QString submitter)
formLayout->addWidget(buttonBox);

setLayout(formLayout);
setWindowTitle("Submit report");
setWindowTitle(caption);
}


Expand Down
4 changes: 2 additions & 2 deletions submitDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Submit report dialog
*
* Copyright (C) 2015 by Sascha Willems (www.saschawillems.de)
* Copyright (C) 2016-2020 by Sascha Willems (www.saschawillems.de)
*
* This code is free software, you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -34,7 +34,7 @@ class submitDialog : public QDialog
public:
std::string submitter;
std::string comment;
submitDialog(QString submitter);
submitDialog(QString submitter, QString caption = "Submit new report");
~submitDialog();
std::string getSubmitter();
std::string getComment();
Expand Down
Loading

0 comments on commit 03d0920

Please sign in to comment.