diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-03-16 08:43:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-21 17:49:58 +0000 |
| commit | 186ff6dfb775811d9ea3dfc64665b6955f587882 (patch) | |
| tree | f9fd91cbf4d2bea6887ae00fc224b3f2166ccd57 /src | |
| parent | abf7b763e2c1ba069942dedec914494817fd27a8 (diff) | |
Fix version check for vulkan layers
Bug: skia:
Change-Id: I9520899c4b86d6436e3697d0cc6358c2b8641169
Reviewed-on: https://skia-review.googlesource.com/114686
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/vk/GrVkExtensions.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/vk/GrVkExtensions.cpp b/src/gpu/vk/GrVkExtensions.cpp index 17737f1799..1fe6515d86 100644 --- a/src/gpu/vk/GrVkExtensions.cpp +++ b/src/gpu/vk/GrVkExtensions.cpp @@ -66,7 +66,7 @@ bool GrVkExtensions::initInstance(uint32_t specVersion) { return false; } for (uint32_t i = 0; i < layerCount; ++i) { - if (nonPatchVersion >= remove_patch_version(layers[i].specVersion)) { + if (nonPatchVersion <= remove_patch_version(layers[i].specVersion)) { fInstanceLayerStrings->push_back() = layers[i].layerName; } } @@ -89,7 +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)) { + if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion)) { fInstanceExtensionStrings->push_back() = extensions[i].extensionName; } } @@ -116,7 +116,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) && + if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion) && find_string(*fInstanceExtensionStrings, extensions[i].extensionName) < 0) { fInstanceExtensionStrings->push_back() = extensions[i].extensionName; SkTQSort(&fInstanceExtensionStrings->front(), &fInstanceExtensionStrings->back(), @@ -159,7 +159,7 @@ bool GrVkExtensions::initDevice(uint32_t specVersion, VkInstance inst, VkPhysica return false; } for (uint32_t i = 0; i < layerCount; ++i) { - if (nonPatchVersion >= remove_patch_version(layers[i].specVersion)) { + if (nonPatchVersion <= remove_patch_version(layers[i].specVersion)) { fDeviceLayerStrings->push_back() = layers[i].layerName; } } @@ -183,7 +183,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)) { + if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion)) { fDeviceExtensionStrings->push_back() = extensions[i].extensionName; } } @@ -212,7 +212,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) && + if (nonPatchVersion <= remove_patch_version(extensions[i].specVersion) && find_string(*fDeviceExtensionStrings, extensions[i].extensionName) < 0) { fDeviceExtensionStrings->push_back() = extensions[i].extensionName; SkTQSort(&fDeviceExtensionStrings->front(), &fDeviceExtensionStrings->back(), cmp); |