Skip to content

Commit bb72719

Browse files
committed
Make former extensions extensions again
1 parent 09d5ad1 commit bb72719

File tree

2 files changed

+11
-27
lines changed

2 files changed

+11
-27
lines changed

Project.toml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,34 @@
11
name = "Vulkan"
22
uuid = "9f14b124-c50e-4008-a7d4-969b3a6cd68a"
3-
version = "0.6.28"
3+
version = "0.6.29"
44
authors = ["Cédric Belmant"]
55

66
[deps]
77
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
88
BitMasks = "a3e06817-fd65-4797-8291-16f435bc2529"
9-
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
109
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
11-
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
1210
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1311
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
1412
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
1513
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
1614
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
1715
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1816
ResultTypes = "08a2b407-ddc3-586a-afd6-c784ad1fffe2"
19-
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
2017
StructEquality = "6ec83bb0-ed9f-11e9-3b4c-2b04cb4e219c"
2118
VulkanCore = "16167f82-ea26-5cba-b1de-ed6fd5e30a11"
2219

2320
[weakdeps]
24-
# ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
25-
# FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
26-
# StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
21+
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
22+
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
23+
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
2724
XCB = "16167f82-ea26-5cba-b1de-ed6fd5e30a10"
2825

2926
[extensions]
30-
# Don't make these extensions until precompilation issues raised
31-
# in https://github.com/JuliaLang/julia/issues/52511 are addressed.
32-
# VulkanColorTypesExt = "ColorTypes"
33-
# VulkanFixedPointNumbersExt = "FixedPointNumbers"
34-
# VulkanFixedPointNumbersColorTypesExt = ["ColorTypes", "FixedPointNumbers"]
35-
# VulkanFixedPointNumbersStaticArraysCoreExt = ["FixedPointNumbers", "StaticArraysCore"]
36-
# VulkanStaticArraysCoreExt = "StaticArraysCore"
27+
VulkanColorTypesExt = "ColorTypes"
28+
VulkanFixedPointNumbersExt = "FixedPointNumbers"
29+
VulkanFixedPointNumbersColorTypesExt = ["ColorTypes", "FixedPointNumbers"]
30+
VulkanFixedPointNumbersStaticArraysCoreExt = ["FixedPointNumbers", "StaticArraysCore"]
31+
VulkanStaticArraysCoreExt = "StaticArraysCore"
3732
VulkanXCBExt = "XCB"
3833

3934
[compat]
@@ -53,15 +48,13 @@ StructEquality = "2"
5348
SwiftShader_jll = "0.1"
5449
VulkanCore = "1.3.1"
5550
XCB = "0.5, 0.6, 0.7"
56-
julia = "1.9"
51+
julia = "1.10"
5752

5853
[extras]
59-
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
6054
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
6155
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
6256
SwiftShader_jll = "c404ff5a-e271-5628-8eaa-423d39d64c15"
6357
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
64-
XCB = "16167f82-ea26-5cba-b1de-ed6fd5e30a10"
6558

6659
[targets]
67-
test = ["Test", "Documenter", "Pkg", "SwiftShader_jll", "XCB"]
60+
test = ["Test", "ColorTypes", "FixedPointNumbers", "StaticArraysCore", "Documenter", "Pkg", "SwiftShader_jll", "XCB"]

src/Vulkan.jl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,6 @@ function __init__()
8585
fill_dispatch_table()
8686
end
8787

88-
# Extensions.
89-
# Turn these into extensions when precompilation issues raised in
90-
# in https://github.com/JuliaLang/julia/issues/52511 are addressed.
91-
include("../ext/VulkanFixedPointNumbersExt.jl")
92-
include("../ext/VulkanColorTypesExt.jl")
93-
include("../ext/VulkanFixedPointNumbersColorTypesExt.jl")
94-
include("../ext/VulkanStaticArraysCoreExt.jl")
95-
include("../ext/VulkanFixedPointNumbersStaticArraysCoreExt.jl")
96-
9788
export
9889
# Wrapper
9990
VulkanStruct,

0 commit comments

Comments
 (0)