Vulkan: Pass correct level count in getLevelDrawImageView

This bug was hit by a KHR ES 3.1 test. This CL just applies the obvious fix already noted by jmadill@. Test: KHR-GLES31.core.shader_image_size.*-nonMS-* Bug: angleproject:4008 Bug: angleproject:4108 Change-Id: I5d05c0a7432f7b70d2b995fd8b11224c119ece5f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2042491Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Vulkan: Pass correct level count in getLevelDrawImageView
e02f4996 · Cody Northrop · Commit Bot · 36f2c80a · e02f4996 · e02f4996
Commit e02f4996 authored Feb 06, 2020 by Cody Northrop Committed by Commit Bot Feb 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

vk_helpers.cpp src/libANGLE/renderer/vulkan/vk_helpers.cpp +1 -2

deqp_khr_gles31_test_expectations.txt src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt +0 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -3652,8 +3652,7 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk,
 {
    onResourceAccess(&contextVk->getResourceUseList());
-    // TODO(http://anglebug.com/4008): Possibly incorrect level count.
+    ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, level, image.getLevelCount());
-    ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, level, 1);
    *imageViewOut = imageView;
    if (imageView->valid())

--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -62,7 +62,6 @@
 4312 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-sync-imageAccess = SKIP
 4315 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-memory-order-vsfs = FAIL
-4108 VULKAN : KHR-GLES31.core.shader_image_size.*-nonMS-* = SKIP
 // Unimplemented glValidateCreateShaderProgramv:
 4146 : KHR-GLES31.core.shader_storage_buffer_object.basic-syntaxSSO = FAIL