@@ -193,7 +193,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
193193 # include <unistd.h>
194194
195195 # include "commit.h"
196- @@ -104 ,7 +104 ,7 @@
196+ @@ -105 ,7 +105 ,7 @@
197197 namespace {
198198
199199 // Enable commit_id.py and #include commit.h for other platforms.
@@ -202,7 +202,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
202202 void logBuildVersionInformation()
203203 {
204204 // TODO(b/144093703): Don't call __android_log_print() directly
205- @@ -139 ,7 +139 ,7 @@
205+ @@ -140 ,7 +140 ,7 @@
206206 void initializeLibrary()
207207 {
208208 static bool doOnce = [] {
@@ -211,7 +211,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
211211 logBuildVersionInformation();
212212 #endif // __ANDROID__ && ENABLE_BUILD_VERSION_OUTPUT
213213 return true;
214- @@ -286 ,7 +286 ,7 @@
214+ @@ -322 ,7 +322 ,7 @@
215215 { { VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION } },
216216 { { VK_EXT_DEBUG_UTILS_EXTENSION_NAME, VK_EXT_DEBUG_UTILS_SPEC_VERSION } },
217217 { { VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME, VK_EXT_HEADLESS_SURFACE_SPEC_VERSION } },
@@ -220,7 +220,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
220220 { { VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION } },
221221 { { VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SURFACE_MAINTENANCE_1_SPEC_VERSION } },
222222 { { VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION } },
223- @@ -340 ,7 +340 ,7 @@
223+ @@ -376 ,7 +376 ,7 @@
224224 // Only 1.1 core version of this is supported. The extension has additional requirements
225225 //{{ VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME, VK_KHR_VARIABLE_POINTERS_SPEC_VERSION }},
226226 { { VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME, VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION } },
@@ -229,16 +229,16 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
229229 // We fully support the KHR_swapchain v70 additions, so just track the spec version.
230230 { { VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_KHR_SWAPCHAIN_SPEC_VERSION } },
231231 #else
232- @@ -416,7 +416,7 @@
232+ @@ -449,7 +449,7 @@
233+ { { VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME, VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION } },
233234 { { VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION } },
234- { { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } },
235235 { { VK_KHR_PIPELINE_LIBRARY_EXTENSION_NAME, VK_KHR_PIPELINE_LIBRARY_SPEC_VERSION } },
236236- #ifndef __ANDROID__
237237+ #if !(defined(__ANDROID__) && !defined(__TERMUX__))
238+ { { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } },
238239 { { VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION } },
239240 #endif
240- { { VK_EXT_GRAPHICS_PIPELINE_LIBRARY_EXTENSION_NAME, VK_EXT_GRAPHICS_PIPELINE_LIBRARY_SPEC_VERSION } },
241- @@ -1952,7 +1952,7 @@
241+ @@ -2038,7 +2038,7 @@
242242
243243 const VkBaseInStructure *extensionCreateInfo = reinterpret_cast<const VkBaseInStructure *>(pCreateInfo->pNext);
244244
@@ -247,7 +247,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
247247 vk::BackingMemory backmem;
248248 bool swapchainImage = false;
249249 #endif
250- @@ -1963 ,7 +1963 ,7 @@
250+ @@ -2049 ,7 +2049 ,7 @@
251251 // VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID, are not enumerated in the official Vulkan headers.
252252 switch((int)(extensionCreateInfo->sType))
253253 {
@@ -256,7 +256,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
256256 case VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID:
257257 {
258258 const VkSwapchainImageCreateInfoANDROID *swapImageCreateInfo = reinterpret_cast<const VkSwapchainImageCreateInfoANDROID *>(extensionCreateInfo);
259- @@ -2023 ,7 +2023 ,7 @@
259+ @@ -2109 ,7 +2109 ,7 @@
260260
261261 VkResult result = vk::Image::Create(pAllocator, pCreateInfo, pImage, vk::Cast(device));
262262
@@ -265,7 +265,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
265265 if(swapchainImage)
266266 {
267267 if(result != VK_SUCCESS)
268- @@ -2061 ,7 +2061 ,7 @@
268+ @@ -2147 ,7 +2147 ,7 @@
269269 TRACE("(VkDevice device = %p, VkImage image = %p, const VkAllocationCallbacks* pAllocator = %p)",
270270 device, static_cast<void *>(image), pAllocator);
271271
@@ -274,7 +274,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
274274 vk::Image *img = vk::Cast(image);
275275 if(img && img->hasExternalMemory())
276276 {
277- @@ -3473 ,7 +3473 ,7 @@
277+ @@ -3573 ,7 +3573 ,7 @@
278278 /* Do nothing */
279279 break;
280280
@@ -283,7 +283,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
283283 case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR:
284284 {
285285 const auto *swapchainInfo = reinterpret_cast<const VkBindImageMemorySwapchainInfoKHR *>(extInfo);
286- @@ -3683 ,7 +3683 ,7 @@
286+ @@ -3783 ,7 +3783 ,7 @@
287287 vk::Cast(physicalDevice)->getProperties(properties);
288288 }
289289 break;
@@ -292,7 +292,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
292292 case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_ANDROID:
293293 {
294294 auto *properties = reinterpret_cast<VkPhysicalDevicePresentationPropertiesANDROID *>(extensionProperties);
295- @@ -3902 ,7 +3902 ,7 @@
295+ @@ -4002 ,7 +4002 ,7 @@
296296
297297 VkBaseOutStructure *extensionProperties = reinterpret_cast<VkBaseOutStructure *>(pImageFormatProperties->pNext);
298298
@@ -301,7 +301,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
301301 bool hasAHBUsage = false;
302302 #endif
303303
304- @@ -3936 ,7 +3936 ,7 @@
304+ @@ -4036 ,7 +4036 ,7 @@
305305 properties->identicalMemoryLayout = VK_TRUE;
306306 }
307307 break;
@@ -310,7 +310,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
310310 case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID:
311311 {
312312 auto *properties = reinterpret_cast<VkAndroidHardwareBufferUsageANDROID *>(extensionProperties);
313- @@ -3966 ,7 +3966 ,7 @@
313+ @@ -4066 ,7 +4066 ,7 @@
314314
315315 vk::Cast(physicalDevice)->getImageFormatProperties(format, type, tiling, usage, flags, &pImageFormatProperties->imageFormatProperties);
316316
@@ -319,7 +319,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
319319 if(hasAHBUsage)
320320 {
321321 // AHardwareBuffer_lock may only be called with a single layer.
322- @@ -4089 ,7 +4089 ,7 @@
322+ @@ -4189 ,7 +4189 ,7 @@
323323 {
324324 switch(extInfo->sType)
325325 {
@@ -328,7 +328,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
328328 case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID:
329329 break;
330330 #endif
331- @@ -4603 ,7 +4603 ,7 @@
331+ @@ -4703 ,7 +4703 ,7 @@
332332 return vk::HeadlessSurfaceKHR::Create(pAllocator, pCreateInfo, pSurface);
333333 }
334334
@@ -337,7 +337,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
337337 VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator)
338338 {
339339 TRACE("(VkInstance instance = %p, VkSurfaceKHR surface = %p, const VkAllocationCallbacks* pAllocator = %p)",
340- @@ -4821 ,7 +4821 ,7 @@
340+ @@ -4921 ,7 +4921 ,7 @@
341341
342342 #endif // ! __ANDROID__
343343
0 commit comments