Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect Vulkan Xlib/Wayland surface support at runtime #4048

Merged
merged 5 commits into from Jan 14, 2018
Merged

Detect Vulkan Xlib/Wayland surface support at runtime #4048

merged 5 commits into from Jan 14, 2018

Conversation

valpackett
Copy link
Contributor

No description provided.

@valpackett valpackett mentioned this pull request Jan 12, 2018
Closed
@hcorion
Copy link
Member

hcorion commented Jan 12, 2018

Confirming that this fixed the issue for me.

tge-was-taken
tge-was-taken reviewed Jan 13, 2018
View reviewed changes
rpcs3/Emu/RSX/VK/VKHelpers.h Outdated
@@ -1135,6 +1136,29 @@ namespace vk
}
};

class supported_extentions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You typo'd extensions

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol oops :D

@valpackett
Detect Vulkan Xlib/Wayland surface support at runtime
62b1399 
To support drivers without Wayland surface support
@kd-11
Copy link
Contributor

kd-11 commented Jan 14, 2018 

../rpcs3/Emu/RSX/VK/VKHelpers.h:1258:29: error: ‘VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME’ was not declared in this scope
    if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) {

@valpackett
Copy link
Contributor Author

huh, I guess that needs the ifdef still

@kd-11
Copy link
Contributor

kd-11 commented Jan 14, 2018 •
edited

Looks like not vulkan headers have the macro definition for wayland surface extension. You can manually link to an external deb which has said declaration and modify travis.yml or use the extension name itself. Travis isn't building as is, making this unmergable. I'd like to get this in fast as it is a hotfix.

@kd-11
Copy link
Contributor

kd-11 commented Jan 14, 2018

Disregard last, found it

#ifdef VK_USE_PLATFORM_WAYLAND_KHR
#define VK_KHR_wayland_surface 1
#include <wayland-client.h>

#define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6
#define VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME "VK_KHR_wayland_surface"

looks like a missing #ifdef like you posited

@valpackett
Add ifdef for Wayland surface detection
d820474 
The extension name is not present when VK_USE_PLATFORM_WAYLAND_KHR is not defined
kd-11
kd-11 reviewed Jan 14, 2018
View reviewed changes
rpcs3/Emu/RSX/VK/VKHelpers.h
{
uint32_t count;
if (vkEnumerateInstanceExtensionProperties(nullptr, &count, nullptr) != VK_SUCCESS)
return;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add space after the return here

kd-11
kd-11 reviewed Jan 14, 2018
View reviewed changes
rpcs3/Emu/RSX/VK/VKHelpers.h Outdated
#endif
supported_extensions support;
bool found_surface_ext = false;
if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brace on newline

kd-11
kd-11 reviewed Jan 14, 2018
View reviewed changes
rpcs3/Emu/RSX/VK/VKHelpers.h Outdated
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

kd-11
kd-11 reviewed Jan 14, 2018
View reviewed changes
rpcs3/Emu/RSX/VK/VKHelpers.h Outdated
found_surface_ext = true;
}
#endif
if (!found_surface_ext) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here

@kd-11 kd-11 merged commit 15d0bdb into RPCS3:master Jan 14, 2018
Zangetsu38 pushed a commit to Zangetsu38/rpcs3 that referenced this pull request Jan 16, 2018
@valpackett @Zangetsu38
Detect Vulkan Xlib/Wayland surface support at runtime (RPCS3#4048)
4a4f017 
Detect Vulkan Xlib/Wayland surface support at runtime
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tge-was-taken tge-was-taken tge-was-taken left review comments

@kd-11 kd-11 kd-11 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@valpackett @hcorion @kd-11 @tge-was-taken