encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-14 09:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Use EXT_metal_surface instead of MVK_macos_surface

Browse Source 
All Vulkan implementations on macOS have EXT_metal_surface available
(MoltenVk, Swiftshader and gfx-rs), and it matches webgpu.h's surface
creation from a CAMetalLayer more closely.

Bug: dawn:269

Change-Id: I313cd366b3509fb8930552406d150f08fc8e3666
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/17962
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2020-03-27 16:37:17 +00:00 committed by Commit Bot service account
parent a44221d05b
commit e784d8d0dc
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dawn_native/vulkan/BackendVk.cpp
View File

@ -196,9 +196,9 @@ namespace dawn_native { namespace vulkan {
layersToRequest.push_back(kLayerNameFuchsiaImagePipeSwapchain); layersToRequest.push_back(kLayerNameFuchsiaImagePipeSwapchain);
usedKnobs.fuchsiaImagePipeSwapchain = true; usedKnobs.fuchsiaImagePipeSwapchain = true;
} }
if (mGlobalInfo.macosSurface) { if (mGlobalInfo.metalSurface) {
extensionsToRequest.push_back(kExtensionNameMvkMacosSurface); extensionsToRequest.push_back(kExtensionNameExtMetalSurface);
usedKnobs.macosSurface = true; usedKnobs.metalSurface = true;
} }
if (mGlobalInfo.surface) { if (mGlobalInfo.surface) {
extensionsToRequest.push_back(kExtensionNameKhrSurface); extensionsToRequest.push_back(kExtensionNameKhrSurface);

6
src/dawn_native/vulkan/VulkanInfo.cpp
View File

@ -56,7 +56,7 @@ namespace dawn_native { namespace vulkan {
const char kExtensionNameExtDebugMarker[] = "VK_EXT_debug_marker"; const char kExtensionNameExtDebugMarker[] = "VK_EXT_debug_marker";
const char kExtensionNameExtDebugReport[] = "VK_EXT_debug_report"; const char kExtensionNameExtDebugReport[] = "VK_EXT_debug_report";
const char kExtensionNameMvkMacosSurface[] = "VK_MVK_macos_surface"; const char kExtensionNameExtMetalSurface[] = "VK_EXT_metal_surface";
const char kExtensionNameKhrExternalMemory[] = "VK_KHR_external_memory"; const char kExtensionNameKhrExternalMemory[] = "VK_KHR_external_memory";
const char kExtensionNameKhrExternalMemoryCapabilities[] = const char kExtensionNameKhrExternalMemoryCapabilities[] =
"VK_KHR_external_memory_capabilities"; "VK_KHR_external_memory_capabilities";
@ -130,8 +130,8 @@ namespace dawn_native { namespace vulkan {
if (IsExtensionName(extension, kExtensionNameExtDebugReport)) { if (IsExtensionName(extension, kExtensionNameExtDebugReport)) {
info.debugReport = true; info.debugReport = true;
} }
if (IsExtensionName(extension, kExtensionNameMvkMacosSurface)) { if (IsExtensionName(extension, kExtensionNameExtMetalSurface)) {
info.macosSurface = true; info.metalSurface = true;
} }
if (IsExtensionName(extension, kExtensionNameKhrExternalMemoryCapabilities)) { if (IsExtensionName(extension, kExtensionNameKhrExternalMemoryCapabilities)) {
info.externalMemoryCapabilities = true; info.externalMemoryCapabilities = true;

4
src/dawn_native/vulkan/VulkanInfo.h
View File

@ -32,7 +32,7 @@ namespace dawn_native { namespace vulkan {
extern const char kExtensionNameExtDebugMarker[]; extern const char kExtensionNameExtDebugMarker[];
extern const char kExtensionNameExtDebugReport[]; extern const char kExtensionNameExtDebugReport[];
extern const char kExtensionNameMvkMacosSurface[]; extern const char kExtensionNameExtMetalSurface[];
extern const char kExtensionNameKhrExternalMemory[]; extern const char kExtensionNameKhrExternalMemory[];
extern const char kExtensionNameKhrExternalMemoryCapabilities[]; extern const char kExtensionNameKhrExternalMemoryCapabilities[];
extern const char kExtensionNameKhrExternalMemoryFD[]; extern const char kExtensionNameKhrExternalMemoryFD[];
@ -66,7 +66,7 @@ namespace dawn_native { namespace vulkan {
bool externalMemoryCapabilities = false; bool externalMemoryCapabilities = false;
bool externalSemaphoreCapabilities = false; bool externalSemaphoreCapabilities = false;
bool getPhysicalDeviceProperties2 = false; bool getPhysicalDeviceProperties2 = false;
bool macosSurface = false; bool metalSurface = false;
bool surface = false; bool surface = false;
bool waylandSurface = false; bool waylandSurface = false;
bool win32Surface = false; bool win32Surface = false;