From e037d7611fd6ca528059f730193f7447b4423e80 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Mon, 2 Apr 2018 10:52:29 -0400 Subject: Remove specVersion check on vk extensions. Unlike the specVersion parameter on the layers, specVersion on extensions does not mean what vulkan spec version the extensions work with but just what version of the extension it is. Thus we don't want to compare it to the version of the spec we are making. Bug: skia: Change-Id: If47c249b4cca0b9a10bfb3b8ce88db6bda1e12ed Reviewed-on: https://skia-review.googlesource.com/117634 Reviewed-by: Brian Osman Commit-Queue: Greg Daniel --- src/gpu/vk/GrVkExtensions.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/gpu/vk/GrVkExtensions.cpp b/src/gpu/vk/GrVkExtensions.cpp index 1fe6515d86..e4768d95c9 100644 --- a/src/gpu/vk/GrVkExtensions.cpp +++ b/src/gpu/vk/GrVkExtensions.cpp @@ -89,9 +89,7 @@ bool GrVkExtensions::initInstance(uint32_t specVersion) { return false; } for (uint32_t i = 0; i < extensionCount; ++i) { - if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion)) { - fInstanceExtensionStrings->push_back() = extensions[i].extensionName; - } + fInstanceExtensionStrings->push_back() = extensions[i].extensionName; } delete [] extensions; // sort so we can search @@ -116,8 +114,7 @@ bool GrVkExtensions::initInstance(uint32_t specVersion) { } for (uint32_t i = 0; i < extensionCount; ++i) { // if not already in the list, add it - if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion) && - find_string(*fInstanceExtensionStrings, extensions[i].extensionName) < 0) { + if (find_string(*fInstanceExtensionStrings, extensions[i].extensionName) < 0) { fInstanceExtensionStrings->push_back() = extensions[i].extensionName; SkTQSort(&fInstanceExtensionStrings->front(), &fInstanceExtensionStrings->back(), cmp); @@ -183,9 +180,7 @@ bool GrVkExtensions::initDevice(uint32_t specVersion, VkInstance inst, VkPhysica return false; } for (uint32_t i = 0; i < extensionCount; ++i) { - if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion)) { - fDeviceExtensionStrings->push_back() = extensions[i].extensionName; - } + fDeviceExtensionStrings->push_back() = extensions[i].extensionName; } delete[] extensions; if (!fDeviceExtensionStrings->empty()) { @@ -212,8 +207,7 @@ bool GrVkExtensions::initDevice(uint32_t specVersion, VkInstance inst, VkPhysica } for (uint32_t i = 0; i < extensionCount; ++i) { // if not already in the list, add it - if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion) && - find_string(*fDeviceExtensionStrings, extensions[i].extensionName) < 0) { + if (find_string(*fDeviceExtensionStrings, extensions[i].extensionName) < 0) { fDeviceExtensionStrings->push_back() = extensions[i].extensionName; SkTQSort(&fDeviceExtensionStrings->front(), &fDeviceExtensionStrings->back(), cmp); } -- cgit v1.2.3