Skip to content

Commit b7c5bac

Browse files
jvanverthSkia Commit-Bot
authored andcommitted
Remove some more MoltenVK support
Change-Id: I511f15f056e15beddeaaf203414a1519569bfbe4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248815 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
1 parent c7a4e77 commit b7c5bac

File tree

2 files changed

+0
-190
lines changed

2 files changed

+0
-190
lines changed

BUILD.gn

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,35 +1268,6 @@ if (skia_enable_tools) {
12681268
}
12691269
}
12701270

1271-
config("moltenvk_config") {
1272-
if (defined(skia_moltenvk_path) && skia_moltenvk_path != "") {
1273-
if (is_ios) {
1274-
moltenvk_framework_path = "$skia_moltenvk_path/MoltenVK/iOS"
1275-
} else {
1276-
moltenvk_framework_path = "$skia_moltenvk_path/MoltenVK/macOS"
1277-
}
1278-
cflags = [ "-F$moltenvk_framework_path" ]
1279-
ldflags = [ "-F$moltenvk_framework_path" ]
1280-
libs = [
1281-
"MoltenVK.framework",
1282-
"Metal.framework",
1283-
"IOSurface.framework",
1284-
"QuartzCore.framework",
1285-
"Foundation.framework",
1286-
]
1287-
if (is_ios) {
1288-
libs += [ "UIKit.framework" ]
1289-
} else {
1290-
libs += [ "IOKit.framework" ]
1291-
}
1292-
defines = [ "SK_MOLTENVK" ]
1293-
}
1294-
}
1295-
1296-
source_set("moltenvk") {
1297-
public_configs = [ ":moltenvk_config" ]
1298-
}
1299-
13001271
test_lib("gpu_tool_utils") {
13011272
public_defines = []
13021273

@@ -1358,9 +1329,6 @@ if (skia_enable_tools) {
13581329
if (skia_use_vulkan) {
13591330
sources += [ "tools/gpu/vk/VkTestContext.cpp" ]
13601331
sources += [ "tools/gpu/vk/VkTestUtils.cpp" ]
1361-
if (defined(skia_moltenvk_path) && skia_moltenvk_path != "") {
1362-
public_deps += [ ":moltenvk" ]
1363-
}
13641332
}
13651333
if (skia_use_metal) {
13661334
sources += [ "tools/gpu/mtl/MtlTestContext.mm" ]
@@ -2210,9 +2178,6 @@ if (skia_enable_tools) {
22102178
libs += [ "X11-xcb" ]
22112179
} else if (is_win) {
22122180
sources += [ "tools/sk_app/win/VulkanWindowContext_win.cpp" ]
2213-
} else if (is_mac) {
2214-
sources += [ "tools/sk_app/mac/VulkanWindowContext_mac.mm" ]
2215-
libs += [ "MetalKit.framework" ]
22162181
}
22172182
}
22182183

tools/sk_app/mac/VulkanWindowContext_mac.mm

Lines changed: 0 additions & 155 deletions
This file was deleted.

0 commit comments

Comments
 (0)